mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Remove deprecated use of spring.main.web-environment
Closes gh-13231
This commit is contained in:
parent
a124379dd9
commit
d5abd57a91
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2017 the original author or authors.
|
||||
* Copyright 2012-2018 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@ -47,7 +47,7 @@ public class OverrideSourcesTests {
|
||||
@Test
|
||||
public void beanInjectedToMainConfiguration() {
|
||||
this.context = SpringApplication.run(new Class<?>[] { MainConfiguration.class },
|
||||
new String[] { "--spring.main.web_environment=false" });
|
||||
new String[] { "--spring.main.web-application-type=none" });
|
||||
assertThat(this.context.getBean(Service.class).bean.name).isEqualTo("foo");
|
||||
}
|
||||
|
||||
@ -55,7 +55,7 @@ public class OverrideSourcesTests {
|
||||
public void primaryBeanInjectedProvingSourcesNotOverridden() {
|
||||
this.context = SpringApplication.run(
|
||||
new Class<?>[] { MainConfiguration.class, TestConfiguration.class },
|
||||
new String[] { "--spring.main.web_environment=false",
|
||||
new String[] { "--spring.main.web-application-type=none",
|
||||
"--spring.main.sources=org.springframework.boot.OverrideSourcesTests.MainConfiguration" });
|
||||
assertThat(this.context.getBean(Service.class).bean.name).isEqualTo("bar");
|
||||
}
|
||||
|
@ -77,7 +77,7 @@ public class SimpleMainTests {
|
||||
|
||||
private String[] getArgs(String... args) {
|
||||
List<String> list = new ArrayList<>(Arrays.asList(
|
||||
"--spring.main.webEnvironment=false", "--spring.main.showBanner=OFF",
|
||||
"--spring.main.web-application-type=none", "--spring.main.showBanner=OFF",
|
||||
"--spring.main.registerShutdownHook=false"));
|
||||
if (args.length > 0) {
|
||||
list.add("--spring.main.sources="
|
||||
|
@ -1091,7 +1091,7 @@ public class SpringApplicationTests {
|
||||
@Test
|
||||
public void nonWebApplicationConfiguredViaAPropertyHasTheCorrectTypeOfContextAndEnvironment() {
|
||||
ConfigurableApplicationContext context = new SpringApplication(
|
||||
ExampleConfig.class).run("--spring.main.web-application-type=NONE");
|
||||
ExampleConfig.class).run("--spring.main.web-application-type=none");
|
||||
assertThat(context).isNotInstanceOfAny(WebApplicationContext.class,
|
||||
ReactiveWebApplicationContext.class);
|
||||
assertThat(context.getEnvironment())
|
||||
|
@ -59,7 +59,7 @@ public class SampleAtmosphereApplicationTests {
|
||||
ClientConfiguration.class, PropertyPlaceholderAutoConfiguration.class)
|
||||
.properties("websocket.uri:ws://localhost:" + this.port
|
||||
+ "/chat/websocket")
|
||||
.run("--spring.main.web_environment=false");
|
||||
.run("--spring.main.web-application-type=none");
|
||||
long count = context.getBean(ClientConfiguration.class).latch.getCount();
|
||||
AtomicReference<String> messagePayloadReference = context
|
||||
.getBean(ClientConfiguration.class).messagePayload;
|
||||
|
@ -59,7 +59,7 @@ public class SampleWebSocketsApplicationTests {
|
||||
ClientConfiguration.class, PropertyPlaceholderAutoConfiguration.class)
|
||||
.properties("websocket.uri:ws://localhost:" + this.port
|
||||
+ "/echo/websocket")
|
||||
.run("--spring.main.web_environment=false");
|
||||
.run("--spring.main.web-application-type=none");
|
||||
long count = context.getBean(ClientConfiguration.class).latch.getCount();
|
||||
AtomicReference<String> messagePayloadReference = context
|
||||
.getBean(ClientConfiguration.class).messagePayload;
|
||||
@ -75,7 +75,7 @@ public class SampleWebSocketsApplicationTests {
|
||||
ClientConfiguration.class, PropertyPlaceholderAutoConfiguration.class)
|
||||
.properties(
|
||||
"websocket.uri:ws://localhost:" + this.port + "/reverse")
|
||||
.run("--spring.main.web_environment=false");
|
||||
.run("--spring.main.web-application-type=none");
|
||||
long count = context.getBean(ClientConfiguration.class).latch.getCount();
|
||||
AtomicReference<String> messagePayloadReference = context
|
||||
.getBean(ClientConfiguration.class).messagePayload;
|
||||
|
@ -65,7 +65,7 @@ public class CustomContainerWebSocketsApplicationTests {
|
||||
ClientConfiguration.class, PropertyPlaceholderAutoConfiguration.class)
|
||||
.properties("websocket.uri:ws://localhost:" + this.port
|
||||
+ "/ws/echo/websocket")
|
||||
.run("--spring.main.web_environment=false");
|
||||
.run("--spring.main.web-application-type=none");
|
||||
long count = context.getBean(ClientConfiguration.class).latch.getCount();
|
||||
AtomicReference<String> messagePayloadReference = context
|
||||
.getBean(ClientConfiguration.class).messagePayload;
|
||||
@ -81,7 +81,7 @@ public class CustomContainerWebSocketsApplicationTests {
|
||||
ClientConfiguration.class, PropertyPlaceholderAutoConfiguration.class)
|
||||
.properties("websocket.uri:ws://localhost:" + this.port
|
||||
+ "/ws/reverse")
|
||||
.run("--spring.main.web_environment=false");
|
||||
.run("--spring.main.web-application-type=none");
|
||||
long count = context.getBean(ClientConfiguration.class).latch.getCount();
|
||||
AtomicReference<String> messagePayloadReference = context
|
||||
.getBean(ClientConfiguration.class).messagePayload;
|
||||
|
@ -59,7 +59,7 @@ public class SampleWebSocketsApplicationTests {
|
||||
ClientConfiguration.class, PropertyPlaceholderAutoConfiguration.class)
|
||||
.properties("websocket.uri:ws://localhost:" + this.port
|
||||
+ "/echo/websocket")
|
||||
.run("--spring.main.web_environment=false");
|
||||
.run("--spring.main.web-application-type=none");
|
||||
long count = context.getBean(ClientConfiguration.class).latch.getCount();
|
||||
AtomicReference<String> messagePayloadReference = context
|
||||
.getBean(ClientConfiguration.class).messagePayload;
|
||||
@ -75,7 +75,7 @@ public class SampleWebSocketsApplicationTests {
|
||||
ClientConfiguration.class, PropertyPlaceholderAutoConfiguration.class)
|
||||
.properties(
|
||||
"websocket.uri:ws://localhost:" + this.port + "/reverse")
|
||||
.run("--spring.main.web_environment=false");
|
||||
.run("--spring.main.web-application-type=none");
|
||||
long count = context.getBean(ClientConfiguration.class).latch.getCount();
|
||||
AtomicReference<String> messagePayloadReference = context
|
||||
.getBean(ClientConfiguration.class).messagePayload;
|
||||
|
@ -65,7 +65,7 @@ public class CustomContainerWebSocketsApplicationTests {
|
||||
ClientConfiguration.class, PropertyPlaceholderAutoConfiguration.class)
|
||||
.properties("websocket.uri:ws://localhost:" + this.port
|
||||
+ "/ws/echo/websocket")
|
||||
.run("--spring.main.web_environment=false");
|
||||
.run("--spring.main.web-application-type=none");
|
||||
long count = context.getBean(ClientConfiguration.class).latch.getCount();
|
||||
AtomicReference<String> messagePayloadReference = context
|
||||
.getBean(ClientConfiguration.class).messagePayload;
|
||||
@ -81,7 +81,7 @@ public class CustomContainerWebSocketsApplicationTests {
|
||||
ClientConfiguration.class, PropertyPlaceholderAutoConfiguration.class)
|
||||
.properties("websocket.uri:ws://localhost:" + this.port
|
||||
+ "/ws/reverse")
|
||||
.run("--spring.main.web_environment=false");
|
||||
.run("--spring.main.web-application-type=none");
|
||||
long count = context.getBean(ClientConfiguration.class).latch.getCount();
|
||||
AtomicReference<String> messagePayloadReference = context
|
||||
.getBean(ClientConfiguration.class).messagePayload;
|
||||
|
@ -59,7 +59,7 @@ public class SampleWebSocketsApplicationTests {
|
||||
ClientConfiguration.class, PropertyPlaceholderAutoConfiguration.class)
|
||||
.properties("websocket.uri:ws://localhost:" + this.port
|
||||
+ "/echo/websocket")
|
||||
.run("--spring.main.web_environment=false");
|
||||
.run("--spring.main.web-application-type=none");
|
||||
long count = context.getBean(ClientConfiguration.class).latch.getCount();
|
||||
AtomicReference<String> messagePayloadReference = context
|
||||
.getBean(ClientConfiguration.class).messagePayload;
|
||||
@ -75,7 +75,7 @@ public class SampleWebSocketsApplicationTests {
|
||||
ClientConfiguration.class, PropertyPlaceholderAutoConfiguration.class)
|
||||
.properties(
|
||||
"websocket.uri:ws://localhost:" + this.port + "/reverse")
|
||||
.run("--spring.main.web_environment=false");
|
||||
.run("--spring.main.web-application-type=none");
|
||||
long count = context.getBean(ClientConfiguration.class).latch.getCount();
|
||||
AtomicReference<String> messagePayloadReference = context
|
||||
.getBean(ClientConfiguration.class).messagePayload;
|
||||
|
@ -65,7 +65,7 @@ public class CustomContainerWebSocketsApplicationTests {
|
||||
ClientConfiguration.class, PropertyPlaceholderAutoConfiguration.class)
|
||||
.properties("websocket.uri:ws://localhost:" + this.port
|
||||
+ "/ws/echo/websocket")
|
||||
.run("--spring.main.web_environment=false");
|
||||
.run("--spring.main.web-application-type=none");
|
||||
long count = context.getBean(ClientConfiguration.class).latch.getCount();
|
||||
AtomicReference<String> messagePayloadReference = context
|
||||
.getBean(ClientConfiguration.class).messagePayload;
|
||||
@ -81,7 +81,7 @@ public class CustomContainerWebSocketsApplicationTests {
|
||||
ClientConfiguration.class, PropertyPlaceholderAutoConfiguration.class)
|
||||
.properties("websocket.uri:ws://localhost:" + this.port
|
||||
+ "/ws/reverse")
|
||||
.run("--spring.main.web_environment=false");
|
||||
.run("--spring.main.web-application-type=none");
|
||||
long count = context.getBean(ClientConfiguration.class).latch.getCount();
|
||||
AtomicReference<String> messagePayloadReference = context
|
||||
.getBean(ClientConfiguration.class).messagePayload;
|
||||
|
Loading…
Reference in New Issue
Block a user