mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '2.0.x' into 2.1.x
This commit is contained in:
Phillip Webb
commit
ccfbd03482
7
pom.xml
7
pom.xml
@ -25,6 +25,7 @@
|
||||
</activation>
|
||||
<properties>
|
||||
<spring-javaformat.version>0.0.9</spring-javaformat.version>
|
||||
<nohttp-checkstyle.version>0.0.1.RELEASE</nohttp-checkstyle.version>
|
||||
</properties>
|
||||
<build>
|
||||
<plugins>
|
||||
@ -43,6 +44,11 @@
|
||||
<artifactId>spring-javaformat-checkstyle</artifactId>
|
||||
<version>${spring-javaformat.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>io.spring.nohttp</groupId>
|
||||
<artifactId>nohttp-checkstyle</artifactId>
|
||||
<version>${nohttp-checkstyle.version}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<executions>
|
||||
<execution>
|
||||
@ -54,6 +60,7 @@
|
||||
<suppressionsLocation>src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
|
||||
<includeTestSourceDirectory>true</includeTestSourceDirectory>
|
||||
<propertyExpansion>main.basedir=${main.basedir}</propertyExpansion>
|
||||
<resourceIncludes>**\/*.*</resourceIncludes>
|
||||
</configuration>
|
||||
<goals>
|
||||
<goal>check</goal>
|
||||
|
||||
@ -0,0 +1 @@
|
||||
|
||||
@ -0,0 +1 @@
|
||||
|
||||
@ -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>");
|
||||
});
|
||||
}
|
||||
|
||||
@ -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>");
|
||||
});
|
||||
}
|
||||
|
||||
@ -0,0 +1 @@
|
||||
|
||||
@ -0,0 +1 @@
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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 @@
|
||||
|
||||
@ -36,11 +36,10 @@ import org.apache.commons.logging.LogFactory;
|
||||
import org.springframework.util.Assert;
|
||||
|
||||
/**
|
||||
* A <a href="http://livereload.com">livereload</a> server.
|
||||
* A <a href="https://github.com/livereload">livereload</a> server.
|
||||
*
|
||||
* @author Phillip Webb
|
||||
* @since 1.3.0
|
||||
* @see <a href="http://livereload.com">livereload.com</a>
|
||||
*/
|
||||
public class LiveReloadServer {
|
||||
|
||||
|
||||
@ -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");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -3,6 +3,8 @@
|
||||
"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
|
||||
"https://checkstyle.org/dtds/suppressions_1_2.dtd">
|
||||
<suppressions>
|
||||
<suppress files="[\\/]target[\\/]" checks=".*" />
|
||||
<suppress files=".+\.[jar|git|ico|p12]" checks=".*" />
|
||||
<suppress files="SpringApplicationTests\.java" checks="FinalClass" />
|
||||
<suppress files=".+Configuration\.java" checks="HideUtilityClassConstructor" />
|
||||
<suppress files=".+Application\.java" checks="HideUtilityClassConstructor" />
|
||||
|
||||
@ -3,6 +3,9 @@
|
||||
"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
|
||||
"https://checkstyle.org/dtds/configuration_1_3.dtd">
|
||||
<module name="com.puppycrawl.tools.checkstyle.Checker">
|
||||
<module name="io.spring.nohttp.checkstyle.check.NoHttpCheck">
|
||||
<property name="whitelistFileName" value="${main.basedir}/src/checkstyle/nohttp-whitelist.txt"/>
|
||||
</module>
|
||||
<module name="io.spring.javaformat.checkstyle.SpringChecks" />
|
||||
<module name="com.puppycrawl.tools.checkstyle.TreeWalker">
|
||||
<module
|
||||
|
||||
1
src/checkstyle/nohttp-whitelist.txt
Normal file
1
src/checkstyle/nohttp-whitelist.txt
Normal file
@ -0,0 +1 @@
|
||||
^http://livereload.com/protocols/official-7$
|
||||
Loading…
Reference in New Issue
Block a user