root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '1.5.x' into 2.0.x

This commit is contained in:
Phillip Webb 2019-06-04 01:49:03 -07:00
parent 5fba43aa31 80d8a5cfa2
commit b442d3b906
31 changed files with 44 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/actuator-docs-index.html
View File

@ -0,0 +1 @@

1
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/db/migration/V1__init.sql
View File

@ -0,0 +1 @@

1
spring-boot-project/spring-boot-actuator/src/test/resources/actuator-docs-index.html
View File

@ -0,0 +1 @@

1
spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V1__init.sql
View File

@ -0,0 +1 @@

1
spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V2__update.sql
View File

@ -0,0 +1 @@

1
spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V3__update.sql
View File

@ -0,0 +1 @@

8
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java
View File

@ -73,7 +73,7 @@ public class ThymeleafReactiveAutoConfigurationTests {
load(BaseConfiguration.class, "spring.thymeleaf.suffix:.html"); load(BaseConfiguration.class, "spring.thymeleaf.suffix:.html");
TemplateEngine engine = this.context.getBean(TemplateEngine.class); TemplateEngine engine = this.context.getBean(TemplateEngine.class);
Context attrs = new Context(Locale.UK, Collections.singletonMap("foo", "bar")); 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>"); assertThat(result).isEqualTo("<html>bar</html>");
} }
@ -176,7 +176,7 @@ public class ThymeleafReactiveAutoConfigurationTests {
ISpringWebFluxTemplateEngine engine = this.context ISpringWebFluxTemplateEngine engine = this.context
.getBean(ISpringWebFluxTemplateEngine.class); .getBean(ISpringWebFluxTemplateEngine.class);
Context attrs = new Context(Locale.UK, Collections.singletonMap("foo", "bar")); 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>"); assertThat(result).isEqualTo("<html><body data-foo=\"bar\"></body></html>");
} }
@ -186,7 +186,7 @@ public class ThymeleafReactiveAutoConfigurationTests {
ISpringWebFluxTemplateEngine engine = this.context ISpringWebFluxTemplateEngine engine = this.context
.getBean(ISpringWebFluxTemplateEngine.class); .getBean(ISpringWebFluxTemplateEngine.class);
Context attrs = new Context(Locale.UK); 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>"); assertThat(result).isEqualTo("<html><body>2015-11-24</body></html>");
} }
@ -196,7 +196,7 @@ public class ThymeleafReactiveAutoConfigurationTests {
ISpringWebFluxTemplateEngine engine = this.context ISpringWebFluxTemplateEngine engine = this.context
.getBean(ISpringWebFluxTemplateEngine.class); .getBean(ISpringWebFluxTemplateEngine.class);
Context attrs = new Context(Locale.UK, Collections.singletonMap("foo", "bar")); 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>"); assertThat(result).isEqualTo("<html><body>bar</body></html>");
} }

8
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java
View File

@ -89,7 +89,7 @@ public class ThymeleafServletAutoConfigurationTests {
"spring.thymeleaf.suffix:"); "spring.thymeleaf.suffix:");
TemplateEngine engine = this.context.getBean(TemplateEngine.class); TemplateEngine engine = this.context.getBean(TemplateEngine.class);
Context attrs = new Context(Locale.UK, Collections.singletonMap("foo", "bar")); 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>"); assertThat(result).isEqualTo("<html>bar</html>");
} }
@ -172,7 +172,7 @@ public class ThymeleafServletAutoConfigurationTests {
load(BaseConfiguration.class); load(BaseConfiguration.class);
TemplateEngine engine = this.context.getBean(TemplateEngine.class); TemplateEngine engine = this.context.getBean(TemplateEngine.class);
Context attrs = new Context(Locale.UK, Collections.singletonMap("foo", "bar")); 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>"); assertThat(result).isEqualTo("<html><body data-foo=\"bar\"></body></html>");
} }
@ -181,7 +181,7 @@ public class ThymeleafServletAutoConfigurationTests {
load(BaseConfiguration.class); load(BaseConfiguration.class);
TemplateEngine engine = this.context.getBean(TemplateEngine.class); TemplateEngine engine = this.context.getBean(TemplateEngine.class);
Context attrs = new Context(Locale.UK); 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>"); assertThat(result).isEqualTo("<html><body>2015-11-24</body></html>");
} }
@ -190,7 +190,7 @@ public class ThymeleafServletAutoConfigurationTests {
load(BaseConfiguration.class); load(BaseConfiguration.class);
TemplateEngine engine = this.context.getBean(TemplateEngine.class); TemplateEngine engine = this.context.getBean(TemplateEngine.class);
Context attrs = new Context(Locale.UK, Collections.singletonMap("foo", "bar")); 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>"); assertThat(result).isEqualTo("<html><body>bar</body></html>");
} }

1
spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.html
View File

@ -0,0 +1 @@

1
spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/migration/V1__init.sql
View File

@ -0,0 +1 @@

1
spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/vendors/h2/V1__init.sql vendored
View File

@ -0,0 +1 @@

1
spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/foo_de.html
View File

@ -0,0 +1 @@

1
spring-boot-project/spring-boot-autoconfigure/src/test/resources/welcome-page/index.html
View File

@ -0,0 +1 @@

13
spring-boot-project/spring-boot-autoconfigure/src/test/resources/wsdl/service.wsdl
View File

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" <wsdl:definitions xmlns:wsdl="https://schemas.xmlsoap.org/wsdl/"
xmlns:tns="http://www.springframework.org/spring-ws/wsdl" xmlns:tns="https://www.springframework.org/spring-ws/wsdl"
xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" targetNamespace="http://www.springframework.org/spring-ws/wsdl"> xmlns:wsdlsoap="https://schemas.xmlsoap.org/wsdl/soap/" targetNamespace="https://www.springframework.org/spring-ws/wsdl">
<wsdl:types> <wsdl:types>
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" <xsd:schema xmlns:xsd="https://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified" targetNamespace="http://www.springframework.org/spring-ws/wsdl"> elementFormDefault="qualified" targetNamespace="https://www.springframework.org/spring-ws/wsdl">
<xsd:element name="request" type="xsd:string" /> <xsd:element name="request" type="xsd:string" />
<xsd:element name="response" type="xsd:string" /> <xsd:element name="response" type="xsd:string" />
</xsd:schema> </xsd:schema>
@ -23,7 +23,7 @@
</wsdl:portType> </wsdl:portType>
<wsdl:binding name="binding" type="tns:portType"> <wsdl:binding name="binding" type="tns:portType">
<wsdlsoap:binding style="document" <wsdlsoap:binding style="document"
transport="http://schemas.xmlsoap.org/soap/http/" /> transport="https://schemas.xmlsoap.org/soap/http/" />
<wsdl:operation name="operation"> <wsdl:operation name="operation">
<wsdlsoap:operation soapAction="" /> <wsdlsoap:operation soapAction="" />
<wsdl:input name="request"> <wsdl:input name="request">
@ -40,4 +40,3 @@
</wsdl:port> </wsdl:port>
</wsdl:service> </wsdl:service>
</wsdl:definitions> </wsdl:definitions>

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/wsdl/types.xsd
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<schema xmlns="http://www.w3.org/2001/XMLSchema" <schema xmlns="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified" 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="request" type="string" />
<element name="response" type="string" /> <element name="response" type="string" />
</schema> </schema>

1
spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/two/.file
View File

@ -0,0 +1 @@

1
spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/resources/root/META-INF/MANIFEST.MF
View File

@ -0,0 +1 @@

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/result/view/MustacheViewTests.java
View File

@ -62,7 +62,7 @@ public class MustacheViewTests {
view.render(Collections.singletonMap("World", "Spring"), MediaType.TEXT_HTML, view.render(Collections.singletonMap("World", "Spring"), MediaType.TEXT_HTML,
this.exchange).block(Duration.ofSeconds(30)); this.exchange).block(Duration.ofSeconds(30));
assertThat(this.exchange.getResponse().getBodyAsString() assertThat(this.exchange.getResponse().getBodyAsString()
.block(Duration.ofSeconds(30))).isEqualTo("Hello Spring"); .block(Duration.ofSeconds(30)).trim()).isEqualTo("Hello Spring");
} }
} }

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/view/MustacheViewTests.java
View File

@ -64,7 +64,7 @@ public class MustacheViewTests {
view.setApplicationContext(this.context); view.setApplicationContext(this.context);
view.render(Collections.singletonMap("World", "Spring"), this.request, view.render(Collections.singletonMap("World", "Spring"), this.request,
this.response); this.response);
assertThat(this.response.getContentAsString()).isEqualTo("Hello Spring"); assertThat(this.response.getContentAsString().trim()).isEqualTo("Hello Spring");
} }
} }