Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0.x' into 2.1.x

Browse Source
This commit is contained in:
Phillip Webb
2019-06-04 02:07:14 -07:00
parent d057f49618 b442d3b906
commit ccfbd03482
107 changed files with 130 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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 {
TemplateEngine engine = 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>");
});
}
@@ -210,7 +210,7 @@ public class ThymeleafReactiveAutoConfigurationTests {
.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>");
});
}
@@ -221,7 +221,7 @@ public class ThymeleafReactiveAutoConfigurationTests {
ISpringWebFluxTemplateEngine engine = 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>");
});
}
@@ -251,7 +251,7 @@ public class ThymeleafReactiveAutoConfigurationTests {
.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>");
});
}

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

@@ -95,7 +95,7 @@ public class ThymeleafServletAutoConfigurationTests {
TemplateEngine engine = 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>");
});
}
@@ -222,7 +222,7 @@ public class ThymeleafServletAutoConfigurationTests {
TemplateEngine engine = 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>");
});
}
@@ -232,7 +232,7 @@ public class ThymeleafServletAutoConfigurationTests {
this.contextRunner.run((context) -> {
TemplateEngine engine = 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>");
});
}
@@ -262,7 +262,7 @@ public class ThymeleafServletAutoConfigurationTests {
TemplateEngine engine = 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>");
});
}

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/mappings/non-annotated.xml
View File

@@ -15,4 +15,4 @@
</basic>
</attributes>
</entity>
</entity-mappings>
</entity-mappings>

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/city.sql
View File

@@ -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');

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-schema.ldif
View File

@@ -14,4 +14,4 @@ objectClasses: ( 1.3.6.1.4.1.32473.1.2.2
SUP top
AUXILIARY
MAY exampleAttributeName
X-ORIGIN 'Managing Schema Document' )
X-ORIGIN 'Managing Schema Document' )

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.ftl
View File

@@ -1 +1 @@
custom
custom

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

@@ -0,0 +1 @@

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.tpl
View File

@@ -1 +1 @@
yield "custom"
yield "custom"

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.vm
View File

@@ -1 +1 @@
custom
custom

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/data.sql
View File

@@ -1 +1 @@
INSERT INTO BAR VALUES (1, 'Andy');
INSERT INTO BAR VALUES (1, 'Andy');

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/non-annotated-data.sql
View File

@@ -1 +1 @@
INSERT INTO NON_ANNOTATED (ID, VALUE) values (2000, 'Test');
INSERT INTO NON_ANNOTATED (ID, VALUE) values (2000, 'Test');

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/ehcache3.xml
View File

@@ -23,4 +23,4 @@
</expiry>
</cache>
</config>
</config>

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/logback-test.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/>
</configuration>
</configuration>

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/foo.html
View File

@@ -1 +1 @@
Hello {{World}}
Hello {{World}}

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

@@ -0,0 +1 @@

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/home.html
View File

@@ -6,4 +6,4 @@
<h2>A Message</h2>
<div>{{message}} at {{time}}</div>
</body>
</html>
</html>

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/layout.html
View File

@@ -12,4 +12,4 @@
</div>
<div class="jumbotron">{{#include}}{{body}}{{/include}}</div>
</body>
</html>
</html>

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/partial.html
View File

@@ -12,4 +12,4 @@
</div>
<div class="jumbotron">{{>content}}</div>
</body>
</html>
</html>

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/another.sql
View File

@@ -1,4 +1,4 @@
CREATE TABLE SPAM (
id INTEGER IDENTITY PRIMARY KEY,
name VARCHAR(30),
);
);

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/data.sql
View File

@@ -1 +1 @@
INSERT INTO FOO VALUES (1, 'Andy');
INSERT INTO FOO VALUES (1, 'Andy');

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/encoding-data.sql
View File

@@ -1,2 +1,2 @@
INSERT INTO BAR(id, name) VALUES (1, 'bar');
INSERT INTO BAR(id, name) VALUES (2, 'ばー');
INSERT INTO BAR(id, name) VALUES (2, 'ばー');

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/schema.sql
View File

@@ -1,4 +1,4 @@
CREATE TABLE FOO (
id INTEGER IDENTITY PRIMARY KEY,
name VARCHAR(30),
);
);

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/web/reactive/error/templates/error/404.mustache
View File

@@ -1 +1 @@
404 page
404 page

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/web/reactive/error/templates/error/4xx.mustache
View File

@@ -1 +1 @@
4xx page
4xx page

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/schema.sql
View File

@@ -1,4 +1,4 @@
CREATE TABLE BAR (
id INTEGER IDENTITY PRIMARY KEY,
name VARCHAR(30),
);
);

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/data-dialect.html
View File

@@ -1 +1 @@
<html><body data:foo="${foo}"></body></html>
<html><body data:foo="${foo}"></body></html>

6
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/error/error.mustache
View File

@@ -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>

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/home.ftl
View File

@@ -1 +1 @@
home
home

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/home.html
View File

@@ -1 +1 @@
<html><body th:text="${foo}">Home</body></html>
<html><body th:text="${foo}">Home</body></html>

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/home.vm
View File

@@ -1 +1 @@
home
home

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/java8time-dialect.html
View File

@@ -1 +1 @@
<html><body th:text="${#temporals.create('2015','11','24')}"></body></html>
<html><body th:text="${#temporals.create('2015','11','24')}"></body></html>

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/layout.html
View File

@@ -11,4 +11,4 @@
</div>
</div>
</body>
</html>
</html>

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/message.ftl
View File

@@ -1 +1 @@
Message: ${greeting}
Message: ${greeting}

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/message.html
View File

@@ -1 +1 @@
<html><body>Message: <span th:text="${greeting}">Hello</span></body></html>
<html><body>Message: <span th:text="${greeting}">Hello</span></body></html>

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/message.vm
View File

@@ -1 +1 @@
Message: ${greeting}
Message: ${greeting}

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.ftl
View File

@@ -1 +1 @@
prefixed
prefixed

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.tpl
View File

@@ -1 +1 @@
yield "prefixed"
yield "prefixed"

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.vm
View File

@@ -1 +1 @@
prefixed
prefixed

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/suffixed.freemarker
View File

@@ -1 +1 @@
suffixed
suffixed

2
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/template.html
View File

@@ -1 +1 @@
<html th:text="${foo}">foo</html>
<html th:text="${foo}">foo</html>

4
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/view.html
View File

@@ -1,4 +1,4 @@
<html xmlns:th="https://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/web/thymeleaf/layout" layout:decorator="layout">
<html xmlns:th="https://www.thymeleaf.org" xmlns:layout="https://www.ultraq.net.nz/web/thymeleaf/layout" layout:decorator="layout">
<head>
<title layout:fragment="title">Content</title>
</head>
@@ -7,4 +7,4 @@
<span th:text="${foo}">foo</span>
</div>
</body>
</html>
</html>

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"?>
<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>

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"?>
<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>