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

Honour custom application name in Kotlin main class

Browse Source 
Closes gh-826
This commit is contained in:
Stephane Nicoll
2019-02-13 09:53:49 +01:00
parent fe66bbab78
commit b0d7bdd343
11 changed files with 182 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/kotlin/KotlinProjectGenerationDefaultContributorsConfiguration.java
View File

@@ -82,14 +82,16 @@ class KotlinProjectGenerationDefaultContributorsConfiguration {
}
@Bean
public MainCompilationUnitCustomizer<KotlinTypeDeclaration, KotlinCompilationUnit> boot15MainFunctionContributor() {
public MainCompilationUnitCustomizer<KotlinTypeDeclaration, KotlinCompilationUnit> boot15MainFunctionContributor(
ResolvedProjectDescription projectDescription) {
return (compilationUnit) -> compilationUnit
.addTopLevelFunction(KotlinFunctionDeclaration.function("main")
.parameters(new Parameter("Array<String>", "args"))
.body(new KotlinExpressionStatement(
new KotlinFunctionInvocation(
"org.springframework.boot.SpringApplication",
"run", "DemoApplication::class.java",
"run", projectDescription.getApplicationName()
+ "::class.java",
"*args"))));
}
@@ -110,14 +112,16 @@ class KotlinProjectGenerationDefaultContributorsConfiguration {
}
@Bean
public MainCompilationUnitCustomizer<KotlinTypeDeclaration, KotlinCompilationUnit> mainFunctionContributor() {
public MainCompilationUnitCustomizer<KotlinTypeDeclaration, KotlinCompilationUnit> mainFunctionContributor(
ResolvedProjectDescription projectDescription) {
return (compilationUnit) -> compilationUnit
.addTopLevelFunction(KotlinFunctionDeclaration.function("main")
.parameters(new Parameter("Array<String>", "args"))
.body(new KotlinExpressionStatement(
new KotlinReifiedFunctionInvocation(
"org.springframework.boot.runApplication",
"DemoApplication", "*args"))));
projectDescription.getApplicationName(),
"*args"))));
}
}

43
initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/CodeComplianceTests.java
View File

@@ -146,6 +146,49 @@ class CodeComplianceTests extends AbstractComplianceTests {
+ "ServletInitializer." + getExpectedExtension(extension)));
}
@ParameterizedTest
@MethodSource("parameters")
void currentGenerationCustomCoordinates(Language language, String extension) {
ProjectAssert project = generateProject(language, maven, "2.1.1.RELEASE",
(description) -> {
description.setGroupId("com.example.acme");
description.setArtifactId("my-project");
description.setPackageName("com.example.acme.myproject");
description.setApplicationName("MyProjectApplication");
});
project.isGenericProject("com.example.acme.myproject", "MyProjectApplication",
language.id(), extension);
project.sourceCodeAssert("src/main/" + language
+ "/com/example/acme/myproject/MyProjectApplication." + extension)
.equalsTo(new ClassPathResource(
"project/" + language + "/standard/MyProjectApplication."
+ getExpectedExtension(extension)));
project.sourceCodeAssert("src/test/" + language
+ "/com/example/acme/myproject/MyProjectApplicationTests." + extension)
.equalsTo(new ClassPathResource(
"project/" + language + "/standard/MyProjectApplicationTests."
+ getExpectedExtension(extension)));
}
@ParameterizedTest
@MethodSource("parameters")
void previousGenerationCustomCoordinates(Language language, String extension) {
ProjectAssert project = generateProject(language, maven, "1.5.18.RELEASE",
(description) -> {
description.setGroupId("com.example.acme");
description.setArtifactId("my-project");
description.setPackageName("com.example.acme.myproject");
description.setApplicationName("MyProjectApplication");
});
project.isGenericProject("com.example.acme.myproject", "MyProjectApplication",
language.id(), extension);
project.sourceCodeAssert("src/main/" + language
+ "/com/example/acme/myproject/MyProjectApplication." + extension)
.equalsTo(new ClassPathResource(
"project/" + language + "/previous/MyProjectApplication."
+ getExpectedExtension(extension)));
}
private String getExpectedExtension(String extension) {
return extension + ".gen";
}

14
initializr-generator-spring/src/test/resources/project/groovy/previous/MyProjectApplication.groovy.gen Normal file
View File

@@ -0,0 +1,14 @@
package com.example.acme.myproject
import org.springframework.boot.SpringApplication
import org.springframework.boot.autoconfigure.SpringBootApplication
@SpringBootApplication
class MyProjectApplication {
static void main(String[] args) {
SpringApplication.run(MyProjectApplication, args)
}
}

14
initializr-generator-spring/src/test/resources/project/groovy/standard/MyProjectApplication.groovy.gen Normal file
View File

@@ -0,0 +1,14 @@
package com.example.acme.myproject
import org.springframework.boot.SpringApplication
import org.springframework.boot.autoconfigure.SpringBootApplication
@SpringBootApplication
class MyProjectApplication {
static void main(String[] args) {
SpringApplication.run(MyProjectApplication, args)
}
}

17
initializr-generator-spring/src/test/resources/project/groovy/standard/MyProjectApplicationTests.groovy.gen Normal file
View File

@@ -0,0 +1,17 @@
package com.example.acme.myproject
import org.junit.Test
import org.junit.runner.RunWith
import org.springframework.boot.test.context.SpringBootTest
import org.springframework.test.context.junit4.SpringRunner
@RunWith(SpringRunner)
@SpringBootTest
class MyProjectApplicationTests {
@Test
void contextLoads() {
}
}

14
initializr-generator-spring/src/test/resources/project/java/previous/MyProjectApplication.java.gen Normal file
View File

@@ -0,0 +1,14 @@
package com.example.acme.myproject;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
public class MyProjectApplication {
public static void main(String[] args) {
SpringApplication.run(MyProjectApplication.class, args);
}
}

14
initializr-generator-spring/src/test/resources/project/java/standard/MyProjectApplication.java.gen Normal file
View File

@@ -0,0 +1,14 @@
package com.example.acme.myproject;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
public class MyProjectApplication {
public static void main(String[] args) {
SpringApplication.run(MyProjectApplication.class, args);
}
}

17
initializr-generator-spring/src/test/resources/project/java/standard/MyProjectApplicationTests.java.gen Normal file
View File

@@ -0,0 +1,17 @@
package com.example.acme.myproject;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
@SpringBootTest
public class MyProjectApplicationTests {
@Test
public void contextLoads() {
}
}

12
initializr-generator-spring/src/test/resources/project/kotlin/previous/MyProjectApplication.kt.gen Normal file
View File

@@ -0,0 +1,12 @@
package com.example.acme.myproject
import org.springframework.boot.SpringApplication
import org.springframework.boot.autoconfigure.SpringBootApplication
@SpringBootApplication
class MyProjectApplication
fun main(args: Array<String>) {
SpringApplication.run(MyProjectApplication::class.java, *args)
}

12
initializr-generator-spring/src/test/resources/project/kotlin/standard/MyProjectApplication.kt.gen Normal file
View File

@@ -0,0 +1,12 @@
package com.example.acme.myproject
import org.springframework.boot.autoconfigure.SpringBootApplication
import org.springframework.boot.runApplication
@SpringBootApplication
class MyProjectApplication
fun main(args: Array<String>) {
runApplication<MyProjectApplication>(*args)
}

17
initializr-generator-spring/src/test/resources/project/kotlin/standard/MyProjectApplicationTests.kt.gen Normal file
View File

@@ -0,0 +1,17 @@
package com.example.acme.myproject
import org.junit.Test
import org.junit.runner.RunWith
import org.springframework.boot.test.context.SpringBootTest
import org.springframework.test.context.junit4.SpringRunner
@RunWith(SpringRunner::class)
@SpringBootTest
class MyProjectApplicationTests {
@Test
fun contextLoads() {
}
}