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

Upgrade to spring-javaformat 0.0.9

Browse Source 
Closes gh-882
This commit is contained in:
Stephane Nicoll
2019-04-03 12:26:24 +02:00
parent 2c0abc8e54
commit 910fddaaa7
6 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
initializr-web/src/main/java/io/spring/initializr/web/project/MainController.java
View File

@@ -120,7 +120,8 @@ public class MainController extends AbstractInitializrController {
@RequestMapping(path = "/", produces = "text/plain")
public ResponseEntity<String> serviceCapabilitiesText(
@RequestHeader(value = HttpHeaders.USER_AGENT, required = false) String userAgent)
@RequestHeader(value = HttpHeaders.USER_AGENT,
required = false) String userAgent)
throws IOException {
String appUrl = generateAppUrl();
InitializrMetadata metadata = this.metadataProvider.get();
@@ -157,8 +158,8 @@ public class MainController extends AbstractInitializrController {
HAL_JSON_CONTENT_TYPE);
}
@RequestMapping(path = "/", produces = { "application/vnd.initializr.v2.1+json",
"application/json" })
@RequestMapping(path = "/",
produces = { "application/vnd.initializr.v2.1+json", "application/json" })
public ResponseEntity<String> serviceCapabilitiesV21() {
return serviceCapabilitiesFor(InitializrMetadataVersion.V2_1);
}
@@ -192,8 +193,8 @@ public class MainController extends AbstractInitializrController {
}
}
@RequestMapping(path = "/dependencies", produces = {
"application/vnd.initializr.v2.1+json", "application/json" })
@RequestMapping(path = "/dependencies",
produces = { "application/vnd.initializr.v2.1+json", "application/json" })
public ResponseEntity<String> dependenciesV21(
@RequestParam(required = false) String bootVersion) {
return dependenciesFor(InitializrMetadataVersion.V2_1, bootVersion);

6
initializr-web/src/test/java/io/spring/initializr/web/AbstractInitializrControllerIntegrationTests.java
View File

@@ -35,9 +35,11 @@ import org.springframework.test.context.TestExecutionListeners.MergeMode;
* @author Stephane Nicoll
*/
@ContextConfiguration(classes = RestTemplateConfig.class)
@TestExecutionListeners(mergeMode = MergeMode.MERGE_WITH_DEFAULTS, listeners = MockMvcClientHttpRequestFactoryTestExecutionListener.class)
@TestExecutionListeners(mergeMode = MergeMode.MERGE_WITH_DEFAULTS,
listeners = MockMvcClientHttpRequestFactoryTestExecutionListener.class)
@AutoConfigureMockMvc
@AutoConfigureRestDocs(outputDir = "target/snippets", uriPort = 80, uriHost = "start.spring.io")
@AutoConfigureRestDocs(outputDir = "target/snippets", uriPort = 80,
uriHost = "start.spring.io")
public abstract class AbstractInitializrControllerIntegrationTests
extends AbstractInitializrIntegrationTests {