mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-07-15 01:07:30 +08:00
Merge branch '1.5.x' into 2.0.x
This commit is contained in:
Phillip Webb
commit
b442d3b906
@ -0,0 +1 @@
|
||||
|
||||
@ -0,0 +1 @@
|
||||
|
||||
@ -0,0 +1 @@
|
||||
|
||||
@ -0,0 +1 @@
|
||||
|
||||
@ -0,0 +1 @@
|
||||
|
||||
@ -0,0 +1 @@
|
||||
|
||||
@ -73,7 +73,7 @@ public class ThymeleafReactiveAutoConfigurationTests {
|
||||
load(BaseConfiguration.class, "spring.thymeleaf.suffix:.html");
|
||||
TemplateEngine engine = this.context.getBean(TemplateEngine.class);
|
||||
Context attrs = new Context(Locale.UK, Collections.singletonMap("foo", "bar"));
|
||||
String result = engine.process("template", attrs);
|
||||
String result = engine.process("template", attrs).trim();
|
||||
assertThat(result).isEqualTo("<html>bar</html>");
|
||||
}
|
||||
|
||||
@ -176,7 +176,7 @@ public class ThymeleafReactiveAutoConfigurationTests {
|
||||
ISpringWebFluxTemplateEngine engine = this.context
|
||||
.getBean(ISpringWebFluxTemplateEngine.class);
|
||||
Context attrs = new Context(Locale.UK, Collections.singletonMap("foo", "bar"));
|
||||
String result = engine.process("data-dialect", attrs);
|
||||
String result = engine.process("data-dialect", attrs).trim();
|
||||
assertThat(result).isEqualTo("<html><body data-foo=\"bar\"></body></html>");
|
||||
}
|
||||
|
||||
@ -186,7 +186,7 @@ public class ThymeleafReactiveAutoConfigurationTests {
|
||||
ISpringWebFluxTemplateEngine engine = this.context
|
||||
.getBean(ISpringWebFluxTemplateEngine.class);
|
||||
Context attrs = new Context(Locale.UK);
|
||||
String result = engine.process("java8time-dialect", attrs);
|
||||
String result = engine.process("java8time-dialect", attrs).trim();
|
||||
assertThat(result).isEqualTo("<html><body>2015-11-24</body></html>");
|
||||
}
|
||||
|
||||
@ -196,7 +196,7 @@ public class ThymeleafReactiveAutoConfigurationTests {
|
||||
ISpringWebFluxTemplateEngine engine = this.context
|
||||
.getBean(ISpringWebFluxTemplateEngine.class);
|
||||
Context attrs = new Context(Locale.UK, Collections.singletonMap("foo", "bar"));
|
||||
String result = engine.process("home", attrs);
|
||||
String result = engine.process("home", attrs).trim();
|
||||
assertThat(result).isEqualTo("<html><body>bar</body></html>");
|
||||
}
|
||||
|
||||
|
||||
@ -89,7 +89,7 @@ public class ThymeleafServletAutoConfigurationTests {
|
||||
"spring.thymeleaf.suffix:");
|
||||
TemplateEngine engine = this.context.getBean(TemplateEngine.class);
|
||||
Context attrs = new Context(Locale.UK, Collections.singletonMap("foo", "bar"));
|
||||
String result = engine.process("template.html", attrs);
|
||||
String result = engine.process("template.html", attrs).trim();
|
||||
assertThat(result).isEqualTo("<html>bar</html>");
|
||||
}
|
||||
|
||||
@ -172,7 +172,7 @@ public class ThymeleafServletAutoConfigurationTests {
|
||||
load(BaseConfiguration.class);
|
||||
TemplateEngine engine = this.context.getBean(TemplateEngine.class);
|
||||
Context attrs = new Context(Locale.UK, Collections.singletonMap("foo", "bar"));
|
||||
String result = engine.process("data-dialect", attrs);
|
||||
String result = engine.process("data-dialect", attrs).trim();
|
||||
assertThat(result).isEqualTo("<html><body data-foo=\"bar\"></body></html>");
|
||||
}
|
||||
|
||||
@ -181,7 +181,7 @@ public class ThymeleafServletAutoConfigurationTests {
|
||||
load(BaseConfiguration.class);
|
||||
TemplateEngine engine = this.context.getBean(TemplateEngine.class);
|
||||
Context attrs = new Context(Locale.UK);
|
||||
String result = engine.process("java8time-dialect", attrs);
|
||||
String result = engine.process("java8time-dialect", attrs).trim();
|
||||
assertThat(result).isEqualTo("<html><body>2015-11-24</body></html>");
|
||||
}
|
||||
|
||||
@ -190,7 +190,7 @@ public class ThymeleafServletAutoConfigurationTests {
|
||||
load(BaseConfiguration.class);
|
||||
TemplateEngine engine = this.context.getBean(TemplateEngine.class);
|
||||
Context attrs = new Context(Locale.UK, Collections.singletonMap("foo", "bar"));
|
||||
String result = engine.process("home", attrs);
|
||||
String result = engine.process("home", attrs).trim();
|
||||
assertThat(result).isEqualTo("<html><body>bar</body></html>");
|
||||
}
|
||||
|
||||
|
||||
@ -15,4 +15,4 @@
|
||||
</basic>
|
||||
</attributes>
|
||||
</entity>
|
||||
</entity-mappings>
|
||||
</entity-mappings>
|
||||
|
||||
@ -1 +1 @@
|
||||
INSERT INTO CITY (ID, NAME, STATE, COUNTRY, MAP) values (2000, 'Washington', 'DC', 'US', 'Google');
|
||||
INSERT INTO CITY (ID, NAME, STATE, COUNTRY, MAP) values (2000, 'Washington', 'DC', 'US', 'Google');
|
||||
|
||||
@ -0,0 +1 @@
|
||||
|
||||
@ -0,0 +1 @@
|
||||
|
||||
@ -1 +1 @@
|
||||
INSERT INTO NON_ANNOTATED (ID, VALUE) values (2000, 'Test');
|
||||
INSERT INTO NON_ANNOTATED (ID, VALUE) values (2000, 'Test');
|
||||
|
||||
@ -0,0 +1 @@
|
||||
|
||||
@ -0,0 +1 @@
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
<html>
|
||||
<body>
|
||||
<ul>
|
||||
<li>status: {{status}}</li>
|
||||
<li>message: {{message}}</li>
|
||||
<li>status: {{status}}</li>
|
||||
<li>message: {{message}}</li>
|
||||
</ul>
|
||||
</body>
|
||||
</html>
|
||||
</html>
|
||||
|
||||
@ -1 +1 @@
|
||||
<html th:text="${foo}">foo</html>
|
||||
<html th:text="${foo}">foo</html>
|
||||
|
||||
@ -0,0 +1 @@
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
|
||||
xmlns:tns="http://www.springframework.org/spring-ws/wsdl"
|
||||
xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" targetNamespace="http://www.springframework.org/spring-ws/wsdl">
|
||||
<wsdl:definitions xmlns:wsdl="https://schemas.xmlsoap.org/wsdl/"
|
||||
xmlns:tns="https://www.springframework.org/spring-ws/wsdl"
|
||||
xmlns:wsdlsoap="https://schemas.xmlsoap.org/wsdl/soap/" targetNamespace="https://www.springframework.org/spring-ws/wsdl">
|
||||
<wsdl:types>
|
||||
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
|
||||
elementFormDefault="qualified" targetNamespace="http://www.springframework.org/spring-ws/wsdl">
|
||||
<xsd:schema xmlns:xsd="https://www.w3.org/2001/XMLSchema"
|
||||
elementFormDefault="qualified" targetNamespace="https://www.springframework.org/spring-ws/wsdl">
|
||||
<xsd:element name="request" type="xsd:string" />
|
||||
<xsd:element name="response" type="xsd:string" />
|
||||
</xsd:schema>
|
||||
@ -23,7 +23,7 @@
|
||||
</wsdl:portType>
|
||||
<wsdl:binding name="binding" type="tns:portType">
|
||||
<wsdlsoap:binding style="document"
|
||||
transport="http://schemas.xmlsoap.org/soap/http/" />
|
||||
transport="https://schemas.xmlsoap.org/soap/http/" />
|
||||
<wsdl:operation name="operation">
|
||||
<wsdlsoap:operation soapAction="" />
|
||||
<wsdl:input name="request">
|
||||
@ -40,4 +40,3 @@
|
||||
</wsdl:port>
|
||||
</wsdl:service>
|
||||
</wsdl:definitions>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<schema xmlns="http://www.w3.org/2001/XMLSchema"
|
||||
elementFormDefault="qualified"
|
||||
targetNamespace="http://www.springframework.org/spring-ws/wsdl/schemas">
|
||||
targetNamespace="https://www.springframework.org/spring-ws/wsdl/schemas">
|
||||
<element name="request" type="string" />
|
||||
<element name="response" type="string" />
|
||||
</schema>
|
||||
|
||||
@ -0,0 +1 @@
|
||||
|
||||
@ -1 +1 @@
|
||||
FOO=BAR
|
||||
FOO=BAR
|
||||
|
||||
@ -0,0 +1 @@
|
||||
|
||||
@ -62,7 +62,7 @@ public class MustacheViewTests {
|
||||
view.render(Collections.singletonMap("World", "Spring"), MediaType.TEXT_HTML,
|
||||
this.exchange).block(Duration.ofSeconds(30));
|
||||
assertThat(this.exchange.getResponse().getBodyAsString()
|
||||
.block(Duration.ofSeconds(30))).isEqualTo("Hello Spring");
|
||||
.block(Duration.ofSeconds(30)).trim()).isEqualTo("Hello Spring");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -64,7 +64,7 @@ public class MustacheViewTests {
|
||||
view.setApplicationContext(this.context);
|
||||
view.render(Collections.singletonMap("World", "Spring"), this.request,
|
||||
this.response);
|
||||
assertThat(this.response.getContentAsString()).isEqualTo("Hello Spring");
|
||||
assertThat(this.response.getContentAsString().trim()).isEqualTo("Hello Spring");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
org.springframework.boot.env.PropertySourceLoader=\
|
||||
org.springframework.boot.context.config.TestPropertySourceLoader1,\
|
||||
org.springframework.boot.context.config.TestPropertySourceLoader2
|
||||
org.springframework.boot.context.config.TestPropertySourceLoader2
|
||||
|
||||
@ -1 +1 @@
|
||||
spring.main.web-application-type: reactive
|
||||
spring.main.web-application-type: reactive
|
||||
|
||||
@ -1 +1 @@
|
||||
Hello {{World}}
|
||||
Hello {{World}}
|
||||
|
||||
@ -1 +1 @@
|
||||
Hello {{World}}
|
||||
Hello {{World}}
|
||||
|
||||
@ -17,4 +17,4 @@ spring:
|
||||
profiles: "!other"
|
||||
my:
|
||||
property: fromnototherprofile
|
||||
notother: foo
|
||||
notother: foo
|
||||
|
||||
@ -3,4 +3,4 @@ install_double_link_service
|
||||
echo 'JAVA_OPTS=-Dserver.port=8081' > /test-service/spring-boot-app.conf
|
||||
start_service
|
||||
await_app http://127.0.0.1:8081/
|
||||
curl -s http://127.0.0.1:8081/
|
||||
curl -s http://127.0.0.1:8081/
|
||||
|
||||
Loading…
Reference in New Issue
Block a user