Polish "Remove default Web UI from Initializr library"

Closes gh-860
This commit is contained in:
Stephane Nicoll 2019-03-19 17:44:43 +00:00
parent 7e479e8297
commit e527172282
6 changed files with 4 additions and 70 deletions

View File

@ -63,14 +63,3 @@ The project can be built from the root directory using the standard Maven comman
----
$ ./mvnw clean install
----
The project also has Selenium tests that instrument the client side. In order to run them
you need first to install Firefox and the latest
https://github.com/mozilla/geckodriver[geckodriver].
Once those are installed you can run the smoke tests by enabling an extra profile:
[indent=0]
----
$ ./mvnw verify -PsmokeTests
----

View File

@ -208,14 +208,6 @@ Just invoke the build at the root of the project
$ ./mvnw clean install
----
If you want to run the smoke tests using Geb, you need to enable the
`smokeTests` profile. Firefox should also be installed on your machine:
[indent=0]
----
$ ./mvnw verify -PsmokeTests
----
To generate the docs as well, you should enable the `full` profile:
[indent=0]

View File

@ -114,16 +114,6 @@
<artifactId>jsonassert</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-firefox-driver</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-support</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
@ -176,37 +166,6 @@
</plugins>
</build>
</profile>
<profile>
<id>smokeTests</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<executions>
<execution>
<id>integration-test</id>
<phase>integration-test</phase>
<goals>
<goal>test</goal>
</goals>
<configuration>
<systemProperties>
<smoke.test>true</smoke.test>
</systemProperties>
<includes>
<include>**/*SmokeTests.java</include>
</includes>
<excludes>
<exclude>**/Abstract*.java</exclude>
</excludes>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>

View File

@ -60,7 +60,6 @@ import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
import org.springframework.web.servlet.resource.ResourceUrlProvider;
/**
* {@link org.springframework.boot.autoconfigure.EnableAutoConfiguration
@ -149,12 +148,10 @@ public class InitializrAutoConfiguration {
public MainController initializrMainController(
InitializrMetadataProvider metadataProvider,
TemplateRenderer templateRenderer,
ResourceUrlProvider resourceUrlProvider,
DependencyMetadataProvider dependencyMetadataProvider,
ProjectGenerationInvoker projectGenerationInvoker) {
return new MainController(metadataProvider, templateRenderer,
resourceUrlProvider, dependencyMetadataProvider,
projectGenerationInvoker);
dependencyMetadataProvider, projectGenerationInvoker);
}
@Bean

View File

@ -24,7 +24,6 @@ import io.spring.initializr.metadata.InitializrMetadataProvider;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.servlet.resource.ResourceUrlProvider;
import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
/**
@ -38,8 +37,7 @@ public abstract class AbstractInitializrController {
private Boolean forceSsl;
protected AbstractInitializrController(InitializrMetadataProvider metadataProvider,
ResourceUrlProvider resourceUrlProvider) {
protected AbstractInitializrController(InitializrMetadataProvider metadataProvider) {
this.metadataProvider = metadataProvider;
}

View File

@ -64,7 +64,6 @@ import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.resource.ResourceUrlProvider;
/**
* The main initializr controller provides access to the configured metadata and serves as
@ -91,10 +90,10 @@ public class MainController extends AbstractInitializrController {
private final ProjectGenerationInvoker projectGenerationInvoker;
public MainController(InitializrMetadataProvider metadataProvider,
TemplateRenderer templateRenderer, ResourceUrlProvider resourceUrlProvider,
TemplateRenderer templateRenderer,
DependencyMetadataProvider dependencyMetadataProvider,
ProjectGenerationInvoker projectGenerationInvoker) {
super(metadataProvider, resourceUrlProvider);
super(metadataProvider);
this.dependencyMetadataProvider = dependencyMetadataProvider;
this.commandLineHelpGenerator = new CommandLineHelpGenerator(templateRenderer);
this.projectGenerationInvoker = projectGenerationInvoker;