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

3
initializr-actuator/src/main/java/io/spring/initializr/actuate/autoconfigure/InitializrStatsAutoConfiguration.java
View File

@@ -45,7 +45,8 @@ import org.springframework.retry.support.RetryTemplate;
@Configuration @Configuration
@EnableConfigurationProperties(StatsProperties.class) @EnableConfigurationProperties(StatsProperties.class)
@ConditionalOnProperty("initializr.stats.elastic.uri") @ConditionalOnProperty("initializr.stats.elastic.uri")
@AutoConfigureAfter(value = RestTemplateAutoConfiguration.class, name = "io.spring.initializr.web.autoconfigure.InitializrAutoConfiguration") @AutoConfigureAfter(value = RestTemplateAutoConfiguration.class,
name = "io.spring.initializr.web.autoconfigure.InitializrAutoConfiguration")
class InitializrStatsAutoConfiguration { class InitializrStatsAutoConfiguration {
private final StatsProperties statsProperties; private final StatsProperties statsProperties;

3
initializr-actuator/src/test/java/io/spring/initializr/actuate/ActuatorIntegrationTests.java
View File

@@ -32,7 +32,8 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Stephane Nicoll * @author Stephane Nicoll
*/ */
@ActiveProfiles("test-default") @ActiveProfiles("test-default")
@SpringBootTest(classes = Config.class, webEnvironment = WebEnvironment.RANDOM_PORT, properties = "management.endpoints.web.exposure.include=info") @SpringBootTest(classes = Config.class, webEnvironment = WebEnvironment.RANDOM_PORT,
properties = "management.endpoints.web.exposure.include=info")
class ActuatorIntegrationTests extends AbstractFullStackInitializrIntegrationTests { class ActuatorIntegrationTests extends AbstractFullStackInitializrIntegrationTests {
@Test @Test

3
initializr-docs/src/test/java/io/spring/initializr/stub/ClientApplicationTests.java
View File

@@ -41,7 +41,8 @@ import static org.assertj.core.api.Assertions.assertThat;
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment = WebEnvironment.NONE) @SpringBootTest(webEnvironment = WebEnvironment.NONE)
@AutoConfigureStubRunner(ids = "io.spring.initializr:initializr-web:${project.version}", stubsMode = StubsMode.LOCAL) @AutoConfigureStubRunner(ids = "io.spring.initializr:initializr-web:${project.version}",
stubsMode = StubsMode.LOCAL)
// tag::test[] // tag::test[]
public class ClientApplicationTests { public class ClientApplicationTests {

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") @RequestMapping(path = "/", produces = "text/plain")
public ResponseEntity<String> serviceCapabilitiesText( public ResponseEntity<String> serviceCapabilitiesText(
@RequestHeader(value = HttpHeaders.USER_AGENT, required = false) String userAgent) @RequestHeader(value = HttpHeaders.USER_AGENT,
required = false) String userAgent)
throws IOException { throws IOException {
String appUrl = generateAppUrl(); String appUrl = generateAppUrl();
InitializrMetadata metadata = this.metadataProvider.get(); InitializrMetadata metadata = this.metadataProvider.get();
@@ -157,8 +158,8 @@ public class MainController extends AbstractInitializrController {
HAL_JSON_CONTENT_TYPE); HAL_JSON_CONTENT_TYPE);
} }
@RequestMapping(path = "/", produces = { "application/vnd.initializr.v2.1+json", @RequestMapping(path = "/",
"application/json" }) produces = { "application/vnd.initializr.v2.1+json", "application/json" })
public ResponseEntity<String> serviceCapabilitiesV21() { public ResponseEntity<String> serviceCapabilitiesV21() {
return serviceCapabilitiesFor(InitializrMetadataVersion.V2_1); return serviceCapabilitiesFor(InitializrMetadataVersion.V2_1);
} }
@@ -192,8 +193,8 @@ public class MainController extends AbstractInitializrController {
} }
} }
@RequestMapping(path = "/dependencies", produces = { @RequestMapping(path = "/dependencies",
"application/vnd.initializr.v2.1+json", "application/json" }) produces = { "application/vnd.initializr.v2.1+json", "application/json" })
public ResponseEntity<String> dependenciesV21( public ResponseEntity<String> dependenciesV21(
@RequestParam(required = false) String bootVersion) { @RequestParam(required = false) String bootVersion) {
return dependenciesFor(InitializrMetadataVersion.V2_1, 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 * @author Stephane Nicoll
*/ */
@ContextConfiguration(classes = RestTemplateConfig.class) @ContextConfiguration(classes = RestTemplateConfig.class)
@TestExecutionListeners(mergeMode = MergeMode.MERGE_WITH_DEFAULTS, listeners = MockMvcClientHttpRequestFactoryTestExecutionListener.class) @TestExecutionListeners(mergeMode = MergeMode.MERGE_WITH_DEFAULTS,
listeners = MockMvcClientHttpRequestFactoryTestExecutionListener.class)
@AutoConfigureMockMvc @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 public abstract class AbstractInitializrControllerIntegrationTests
extends AbstractInitializrIntegrationTests { extends AbstractInitializrIntegrationTests {

2
pom.xml
View File

@@ -44,7 +44,7 @@
<junit-jupiter.version>5.4.0</junit-jupiter.version> <junit-jupiter.version>5.4.0</junit-jupiter.version>
<spring.boot.version>2.1.3.RELEASE</spring.boot.version> <spring.boot.version>2.1.3.RELEASE</spring.boot.version>
<spring-cloud-contract.version>2.0.0.RELEASE</spring-cloud-contract.version> <spring-cloud-contract.version>2.0.0.RELEASE</spring-cloud-contract.version>
<spring-javaformat.version>0.0.7</spring-javaformat.version> <spring-javaformat.version>0.0.9</spring-javaformat.version>
</properties> </properties>
<modules> <modules>