lsm/initializr
1
0
Fork 0
mirror of https://gitee.com/dcren/initializr.git synced 2026-02-25 21:22:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix SpringBootServletInitializr import

Browse Source 
As of Spring Boot 1.4.0.M3, `SpringBootServletInitializer` has been
relocated to the `org.springframework.boot.web.support` package. This
commit makes sure to use the new location if a project is generated for
Spring Boot `1.4.0.M3` or higher.

Closes gh-243
This commit is contained in:
Stephane Nicoll
2016-07-06 10:44:08 +02:00
parent c1af184882
commit f1322750b8
11 changed files with 72 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
initializr-generator/src/main/groovy/io/spring/initializr/generator/ProjectGenerator.groovy
View File

@@ -46,6 +46,8 @@ class ProjectGenerator {
private static final VERSION_1_4_0_M2 = Version.parse('1.4.0.M2')
private static final VERSION_1_4_0_M3 = Version.parse('1.4.0.M3')
@Autowired
ApplicationEventPublisher eventPublisher
@@ -227,6 +229,9 @@ class ProjectGenerator {
// New testing stuff
model['newTestInfrastructure'] = isNewTestInfrastructureAvailable(request)
// New Servlet Initializer location
model['newServletInitializer'] = isNewServletInitializerAvailable(request)
model
}
@@ -264,6 +269,11 @@ class ProjectGenerator {
.compareTo(Version.safeParse(request.bootVersion)) <= 0
}
private static boolean isNewServletInitializerAvailable(ProjectRequest request) {
VERSION_1_4_0_M3
.compareTo(Version.safeParse(request.bootVersion)) <= 0
}
private byte[] doGenerateMavenPom(Map model) {
template 'starter-pom.xml', model
}

5
initializr-generator/src/main/resources/templates/ServletInitializer.groovy.tmpl
View File

@@ -1,7 +1,8 @@
package ${packageName}
import org.springframework.boot.builder.SpringApplicationBuilder
import org.springframework.boot.context.web.SpringBootServletInitializer
import org.springframework.boot.builder.SpringApplicationBuilder<% if (newTestInfrastructure) { %>
import org.springframework.boot.web.support.SpringBootServletInitializer<% } else { %>
import org.springframework.boot.context.web.SpringBootServletInitializer<% } %>
class ServletInitializer extends SpringBootServletInitializer {

5
initializr-generator/src/main/resources/templates/ServletInitializer.java
View File

@@ -1,7 +1,8 @@
package ${packageName};
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.context.web.SpringBootServletInitializer;
import org.springframework.boot.builder.SpringApplicationBuilder;<% if (newTestInfrastructure) { %>
import org.springframework.boot.web.support.SpringBootServletInitializer;<% } else { %>
import org.springframework.boot.context.web.SpringBootServletInitializer;<% } %>
public class ServletInitializer extends SpringBootServletInitializer {

5
initializr-generator/src/main/resources/templates/ServletInitializer.kt
View File

@@ -1,7 +1,8 @@
package ${packageName}
import org.springframework.boot.builder.SpringApplicationBuilder
import org.springframework.boot.context.web.SpringBootServletInitializer
import org.springframework.boot.builder.SpringApplicationBuilder<% if (newTestInfrastructure) { %>
import org.springframework.boot.web.support.SpringBootServletInitializer<% } else { %>
import org.springframework.boot.context.web.SpringBootServletInitializer<% } %>
class ServletInitializer : SpringBootServletInitializer() {

19
initializr-generator/src/test/groovy/io/spring/initializr/generator/ProjectGeneratorLanguageTests.groovy
View File

@@ -110,25 +110,36 @@ class ProjectGeneratorLanguageTests extends AbstractProjectGeneratorTests {
}
@Test
public void test14TestClass() {
public void springBoot14ServletInitializer() {
def request = createProjectRequest()
request.language = language
request.packaging = 'war'
request.bootVersion = '1.4.0.M3'
def project = generateProject(request)
project.sourceCodeAssert("src/main/$language/com/example/ServletInitializer.$extension")
.equalsTo(new ClassPathResource("project/$language/spring-boot-1.4/ServletInitializer.$expectedExtension"))
}
@Test
public void springBoot14TestClass() {
def request = createProjectRequest()
request.language = language
request.bootVersion = '1.4.0.M2'
def project = generateProject(request)
project.sourceCodeAssert("src/test/$language/com/example/DemoApplicationTests.$extension")
.equalsTo(new ClassPathResource("project/$language/test-1.4/DemoApplicationTests.$expectedExtension"))
.equalsTo(new ClassPathResource("project/$language/spring-boot-1.4/DemoApplicationTests.$expectedExtension"))
}
@Test
public void test14TestClassWeb() {
public void springBoot14TestClassWeb() {
def request = createProjectRequest('web')
request.language = language
request.bootVersion = '1.4.0.M2'
def project = generateProject(request)
project.sourceCodeAssert("src/test/$language/com/example/DemoApplicationTests.$extension")
.equalsTo(new ClassPathResource("project/$language/test-1.4/DemoApplicationTests.$expectedExtension"))
.equalsTo(new ClassPathResource("project/$language/spring-boot-1.4/DemoApplicationTests.$expectedExtension"))
}
}

0
initializr-generator/src/test/resources/project/groovy/test-1.4/DemoApplicationTests.groovy.gen → initializr-generator/src/test/resources/project/groovy/spring-boot-1.4/DemoApplicationTests.groovy.gen
View File

13
initializr-generator/src/test/resources/project/groovy/spring-boot-1.4/ServletInitializer.groovy.gen Normal file
View File

@@ -0,0 +1,13 @@
package com.example
import org.springframework.boot.builder.SpringApplicationBuilder
import org.springframework.boot.web.support.SpringBootServletInitializer
class ServletInitializer extends SpringBootServletInitializer {
@Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
application.sources(DemoApplication)
}
}

0
initializr-generator/src/test/resources/project/java/test-1.4/DemoApplicationTests.java.gen → initializr-generator/src/test/resources/project/java/spring-boot-1.4/DemoApplicationTests.java.gen
View File

13
initializr-generator/src/test/resources/project/java/spring-boot-1.4/ServletInitializer.java.gen Normal file
View File

@@ -0,0 +1,13 @@
package com.example;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.support.SpringBootServletInitializer;
public class ServletInitializer extends SpringBootServletInitializer {
@Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
return application.sources(DemoApplication.class);
}
}

0
initializr-generator/src/test/resources/project/kotlin/test-1.4/DemoApplicationTests.kt.gen → initializr-generator/src/test/resources/project/kotlin/spring-boot-1.4/DemoApplicationTests.kt.gen
View File

12
initializr-generator/src/test/resources/project/kotlin/spring-boot-1.4/ServletInitializer.kt.gen Normal file
View File

@@ -0,0 +1,12 @@
package com.example
import org.springframework.boot.builder.SpringApplicationBuilder
import org.springframework.boot.web.support.SpringBootServletInitializer
class ServletInitializer : SpringBootServletInitializer() {
override fun configure(application: SpringApplicationBuilder) : SpringApplicationBuilder {
return application.sources(DemoApplication::class.java)
}
}