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

Polish

Browse Source 
See gh-1370
This commit is contained in:
Brian Clozel 2023-02-02 20:08:56 +01:00
parent 10d22bc534
commit 71cdc06911
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
initializr-actuator/src/main/java/io/spring/initializr/actuate/stat/ProjectRequestDocumentFactory.java
View File

@ -18,6 +18,8 @@ package io.spring.initializr.actuate.stat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import io.spring.initializr.actuate.stat.ProjectRequestDocument.ClientInformation; import io.spring.initializr.actuate.stat.ProjectRequestDocument.ClientInformation;
@ -38,9 +40,12 @@ import org.springframework.util.StringUtils;
* Create {@link ProjectRequestDocument} instances. * Create {@link ProjectRequestDocument} instances.
* *
* @author Stephane Nicoll * @author Stephane Nicoll
* @author Brian Clozel
*/ */
public class ProjectRequestDocumentFactory { public class ProjectRequestDocumentFactory {
private static final Pattern PROJECT_TYPE_PATTERN = Pattern.compile("([a-z]*)-[a-z-]*");
public ProjectRequestDocument createDocument(ProjectRequestEvent event) { public ProjectRequestDocument createDocument(ProjectRequestEvent event) {
InitializrMetadata metadata = event.getMetadata(); InitializrMetadata metadata = event.getMetadata();
ProjectRequest request = event.getProjectRequest(); ProjectRequest request = event.getProjectRequest();
@ -97,9 +102,11 @@ public class ProjectRequestDocumentFactory {
} }
private String determineBuildSystem(ProjectRequest request) { private String determineBuildSystem(ProjectRequest request) {
String type = request.getType(); Matcher typeMatcher = PROJECT_TYPE_PATTERN.matcher(request.getType());
String[] elements = type.split("-"); if (typeMatcher.matches()) {
return (elements.length >= 2) ? elements[0] : null; return typeMatcher.group(1);
}
return null;
} }
private VersionInformation determineVersionInformation(ProjectRequest request) { private VersionInformation determineVersionInformation(ProjectRequest request) {

2
initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/ProjectGenerationStatPublisherTests.java
View File

@ -185,7 +185,7 @@ class ProjectGenerationStatPublisherTests {
ProjectRequest request = createProjectRequest(); ProjectRequest request = createProjectRequest();
request.setGroupId("com.example.acme"); request.setGroupId("com.example.acme");
request.setArtifactId("test"); request.setArtifactId("test");
request.setType("not-a-type"); request.setType("not_a_type");
request.setBootVersion("2.1.0.RELEASE"); request.setBootVersion("2.1.0.RELEASE");
request.setDependencies(Arrays.asList("web", "data-jpa")); request.setDependencies(Arrays.asList("web", "data-jpa"));
request.setLanguage("java"); request.setLanguage("java");

2
initializr-actuator/src/test/resources/stat/request-invalid-type.json
View File

@ -1,6 +1,6 @@
{ {
"generationTimestamp": 0, "generationTimestamp": 0,
"type": "not-a-type", "type": "not_a_type",
"groupId": "com.example.acme", "groupId": "com.example.acme",
"artifactId": "test", "artifactId": "test",
"javaVersion": "1.8", "javaVersion": "1.8",