mirror of
https://gitee.com/dcren/initializr.git
synced 2025-12-02 19:34:05 +08:00
Allow generation of custom files
To generate additional files, `doGenerateProjectStructure` should be overridden but doing so doesn't work as `ProjectGeneratedEvent` is publised as part as the base implementation. See gh-552
This commit is contained in:
committed by
Stephane Nicoll
parent
aa323e4950
commit
f224c6a38a
@@ -186,7 +186,9 @@ public class ProjectGenerator {
|
|||||||
*/
|
*/
|
||||||
public File generateProjectStructure(ProjectRequest request) {
|
public File generateProjectStructure(ProjectRequest request) {
|
||||||
try {
|
try {
|
||||||
return doGenerateProjectStructure(request);
|
File rootDir = doGenerateProjectStructure(request);
|
||||||
|
publishProjectGeneratedEvent(request);
|
||||||
|
return rootDir;
|
||||||
}
|
}
|
||||||
catch (InitializrException ex) {
|
catch (InitializrException ex) {
|
||||||
publishProjectFailedEvent(request, ex);
|
publishProjectFailedEvent(request, ex);
|
||||||
@@ -254,9 +256,7 @@ public class ProjectGenerator {
|
|||||||
new File(dir, "src/main/resources/templates").mkdirs();
|
new File(dir, "src/main/resources/templates").mkdirs();
|
||||||
new File(dir, "src/main/resources/static").mkdirs();
|
new File(dir, "src/main/resources/static").mkdirs();
|
||||||
}
|
}
|
||||||
publishProjectGeneratedEvent(request);
|
|
||||||
return rootDir;
|
return rootDir;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -566,11 +566,11 @@ public class ProjectGenerator {
|
|||||||
&& !request.getJavaVersion().equals("1.7");
|
&& !request.getJavaVersion().equals("1.7");
|
||||||
}
|
}
|
||||||
|
|
||||||
private static boolean isGradleBuild(ProjectRequest request) {
|
protected static boolean isGradleBuild(ProjectRequest request) {
|
||||||
return "gradle".equals(request.getBuild());
|
return "gradle".equals(request.getBuild());
|
||||||
}
|
}
|
||||||
|
|
||||||
private static boolean isMavenBuild(ProjectRequest request) {
|
protected static boolean isMavenBuild(ProjectRequest request) {
|
||||||
return "maven".equals(request.getBuild());
|
return "maven".equals(request.getBuild());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -48,11 +48,19 @@ public abstract class AbstractProjectGeneratorTests {
|
|||||||
@Rule
|
@Rule
|
||||||
public final TemporaryFolder folder = new TemporaryFolder();
|
public final TemporaryFolder folder = new TemporaryFolder();
|
||||||
|
|
||||||
protected final ProjectGenerator projectGenerator = new ProjectGenerator();
|
protected final ProjectGenerator projectGenerator;
|
||||||
|
|
||||||
private final ApplicationEventPublisher eventPublisher = mock(
|
protected final ApplicationEventPublisher eventPublisher = mock(
|
||||||
ApplicationEventPublisher.class);
|
ApplicationEventPublisher.class);
|
||||||
|
|
||||||
|
public AbstractProjectGeneratorTests() {
|
||||||
|
this(new ProjectGenerator());
|
||||||
|
}
|
||||||
|
|
||||||
|
public AbstractProjectGeneratorTests(ProjectGenerator projectGenerator) {
|
||||||
|
this.projectGenerator = projectGenerator;
|
||||||
|
}
|
||||||
|
|
||||||
@Before
|
@Before
|
||||||
public void setup() throws IOException {
|
public void setup() throws IOException {
|
||||||
Dependency web = Dependency.withId("web");
|
Dependency web = Dependency.withId("web");
|
||||||
@@ -104,7 +112,7 @@ public abstract class AbstractProjectGeneratorTests {
|
|||||||
verify(eventPublisher, times(1)).publishEvent(argThat(new ProjectFailedEventMatcher(request, ex)));
|
verify(eventPublisher, times(1)).publishEvent(argThat(new ProjectFailedEventMatcher(request, ex)));
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class ProjectGeneratedEventMatcher
|
protected static class ProjectGeneratedEventMatcher
|
||||||
extends ArgumentMatcher<ProjectGeneratedEvent> {
|
extends ArgumentMatcher<ProjectGeneratedEvent> {
|
||||||
|
|
||||||
private final ProjectRequest request;
|
private final ProjectRequest request;
|
||||||
|
|||||||
@@ -0,0 +1,63 @@
|
|||||||
|
package io.spring.initializr.generator;
|
||||||
|
|
||||||
|
import io.spring.initializr.test.generator.ProjectAssert;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.mockito.InOrder;
|
||||||
|
import org.mockito.Mockito;
|
||||||
|
import org.springframework.core.io.ClassPathResource;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
|
||||||
|
import static org.mockito.Matchers.argThat;
|
||||||
|
import static org.mockito.Mockito.times;
|
||||||
|
|
||||||
|
public class CustomProjectGeneratorTests extends AbstractProjectGeneratorTests {
|
||||||
|
|
||||||
|
public CustomProjectGeneratorTests() {
|
||||||
|
super(new MyProjectGenerator());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void jenkinsfileMaven() {
|
||||||
|
ProjectRequest request = createProjectRequest();
|
||||||
|
request.setType("maven-project");
|
||||||
|
ProjectAssert project = generateProject(request);
|
||||||
|
project.sourceCodeAssert("Jenkinsfile")
|
||||||
|
.equalsTo(new ClassPathResource("project/maven/Jenkinsfile"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void jenkinsfileGradle() {
|
||||||
|
ProjectRequest request = createProjectRequest();
|
||||||
|
request.setType("gradle-build");
|
||||||
|
ProjectAssert project = generateProject(request);
|
||||||
|
project.hasNoFile("Jenkinsfile");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void projectGenerationEventAfterGeneratingAllFiles() throws Exception {
|
||||||
|
ProjectRequest request = createProjectRequest("web");
|
||||||
|
generateProject(request);
|
||||||
|
verifyProjectSuccessfulEventFor(request);
|
||||||
|
|
||||||
|
Runnable jenkinsfileGenerated = ((MyProjectGenerator) projectGenerator).jenkinsfileGenerated;
|
||||||
|
InOrder inOrder = Mockito.inOrder(eventPublisher, jenkinsfileGenerated);
|
||||||
|
|
||||||
|
inOrder.verify(jenkinsfileGenerated, times(1)).run();
|
||||||
|
inOrder.verify(eventPublisher, times(1)).publishEvent(argThat(new ProjectGeneratedEventMatcher(request)));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static class MyProjectGenerator extends ProjectGenerator {
|
||||||
|
protected final Runnable jenkinsfileGenerated = Mockito.mock(Runnable.class);
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected File doGenerateProjectStructure(ProjectRequest request) {
|
||||||
|
File dir = super.doGenerateProjectStructure(request);
|
||||||
|
if (isMavenBuild(request)) {
|
||||||
|
write(new File(dir, "Jenkinsfile"), "Jenkinsfile.tmpl", resolveModel(request));
|
||||||
|
jenkinsfileGenerated.run();
|
||||||
|
}
|
||||||
|
return dir;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
16
initializr-generator/src/test/resources/project/maven/Jenkinsfile
vendored
Normal file
16
initializr-generator/src/test/resources/project/maven/Jenkinsfile
vendored
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
pipeline {
|
||||||
|
agent any
|
||||||
|
stages {
|
||||||
|
stage ('Build') {
|
||||||
|
steps {
|
||||||
|
echo "building com.example:demo:0.0.1-SNAPSHOT"
|
||||||
|
sh 'mvn -Dmaven.test.failure.ignore=true -B clean install'
|
||||||
|
}
|
||||||
|
post {
|
||||||
|
success {
|
||||||
|
junit 'target/surefire-reports/**/*.xml'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
pipeline {
|
||||||
|
agent any
|
||||||
|
stages {
|
||||||
|
stage ('Build') {
|
||||||
|
steps {
|
||||||
|
echo "building {{groupId}}:{{artifactId}}:{{version}}"
|
||||||
|
sh 'mvn -Dmaven.test.failure.ignore=true -B clean install'
|
||||||
|
}
|
||||||
|
post {
|
||||||
|
success {
|
||||||
|
junit 'target/surefire-reports/**/*.xml'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user