Skip to content

S
spring-boot
Commit d306b31c authored by Phillip Webb's avatar Phillip Webb
Browse files
Options

Merge branch '2.1.x'

parents 2b51cf44 ccfbd034
Show whitespace changes
Inline Side-by-side
Showing with 130 additions and 112 deletions
pom.xml
View file @ d306b31c
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
</activation> </activation>
<properties> <properties>
<spring-javaformat.version>0.0.9</spring-javaformat.version> <spring-javaformat.version>0.0.9</spring-javaformat.version>
<nohttp-checkstyle.version>0.0.1.RELEASE</nohttp-checkstyle.version>
</properties> </properties>
<build> <build>
<plugins> <plugins>
...@@ -43,6 +44,11 @@ ...@@ -43,6 +44,11 @@
<artifactId>spring-javaformat-checkstyle</artifactId> <artifactId>spring-javaformat-checkstyle</artifactId>
<version>${spring-javaformat.version}</version> <version>${spring-javaformat.version}</version>
</dependency> </dependency>
<dependency>
<groupId>io.spring.nohttp</groupId>
<artifactId>nohttp-checkstyle</artifactId>
<version>${nohttp-checkstyle.version}</version>
</dependency>
</dependencies> </dependencies>
<executions> <executions>
<execution> <execution>
...@@ -54,6 +60,7 @@ ...@@ -54,6 +60,7 @@
<suppressionsLocation>src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation> <suppressionsLocation>src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
<includeTestSourceDirectory>true</includeTestSourceDirectory> <includeTestSourceDirectory>true</includeTestSourceDirectory>
<propertyExpansion>main.basedir=${main.basedir}</propertyExpansion> <propertyExpansion>main.basedir=${main.basedir}</propertyExpansion>
<resourceIncludes>**\/*.*</resourceIncludes>
</configuration> </configuration>
<goals> <goals>
<goal>check</goal> <goal>check</goal>
......
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java
View file @ d306b31c
...@@ -73,7 +73,7 @@ public class ThymeleafReactiveAutoConfigurationTests { ...@@ -73,7 +73,7 @@ public class ThymeleafReactiveAutoConfigurationTests {
TemplateEngine engine = context.getBean(TemplateEngine.class); TemplateEngine engine = context.getBean(TemplateEngine.class);
Context attrs = new Context(Locale.UK, Context attrs = new Context(Locale.UK,
Collections.singletonMap("foo", "bar")); 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>");
}); });
} }
...@@ -210,7 +210,7 @@ public class ThymeleafReactiveAutoConfigurationTests { ...@@ -210,7 +210,7 @@ public class ThymeleafReactiveAutoConfigurationTests {
.getBean(ISpringWebFluxTemplateEngine.class); .getBean(ISpringWebFluxTemplateEngine.class);
Context attrs = new Context(Locale.UK, Context attrs = new Context(Locale.UK,
Collections.singletonMap("foo", "bar")); 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>");
}); });
} }
...@@ -221,7 +221,7 @@ public class ThymeleafReactiveAutoConfigurationTests { ...@@ -221,7 +221,7 @@ public class ThymeleafReactiveAutoConfigurationTests {
ISpringWebFluxTemplateEngine engine = context ISpringWebFluxTemplateEngine engine = 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>");
}); });
} }
...@@ -251,7 +251,7 @@ public class ThymeleafReactiveAutoConfigurationTests { ...@@ -251,7 +251,7 @@ public class ThymeleafReactiveAutoConfigurationTests {
.getBean(ISpringWebFluxTemplateEngine.class); .getBean(ISpringWebFluxTemplateEngine.class);
Context attrs = new Context(Locale.UK, Context attrs = new Context(Locale.UK,
Collections.singletonMap("foo", "bar")); 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>");
}); });
} }
......
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java
View file @ d306b31c
...@@ -98,7 +98,7 @@ public class ThymeleafServletAutoConfigurationTests { ...@@ -98,7 +98,7 @@ public class ThymeleafServletAutoConfigurationTests {
TemplateEngine engine = context.getBean(TemplateEngine.class); TemplateEngine engine = context.getBean(TemplateEngine.class);
Context attrs = new Context(Locale.UK, Context attrs = new Context(Locale.UK,
Collections.singletonMap("foo", "bar")); 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>");
}); });
} }
...@@ -225,7 +225,7 @@ public class ThymeleafServletAutoConfigurationTests { ...@@ -225,7 +225,7 @@ public class ThymeleafServletAutoConfigurationTests {
TemplateEngine engine = context.getBean(TemplateEngine.class); TemplateEngine engine = context.getBean(TemplateEngine.class);
Context attrs = new Context(Locale.UK, Context attrs = new Context(Locale.UK,
Collections.singletonMap("foo", "bar")); 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>");
}); });
} }
...@@ -235,7 +235,7 @@ public class ThymeleafServletAutoConfigurationTests { ...@@ -235,7 +235,7 @@ public class ThymeleafServletAutoConfigurationTests {
this.contextRunner.run((context) -> { this.contextRunner.run((context) -> {
TemplateEngine engine = context.getBean(TemplateEngine.class); TemplateEngine engine = 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>");
}); });
} }
...@@ -265,7 +265,7 @@ public class ThymeleafServletAutoConfigurationTests { ...@@ -265,7 +265,7 @@ public class ThymeleafServletAutoConfigurationTests {
TemplateEngine engine = context.getBean(TemplateEngine.class); TemplateEngine engine = context.getBean(TemplateEngine.class);
Context attrs = new Context(Locale.UK, Context attrs = new Context(Locale.UK,
Collections.singletonMap("foo", "bar")); 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>");
}); });
} }
......
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/view.html
View file @ d306b31c
<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> <head>
<title layout:fragment="title">Content</title> <title layout:fragment="title">Content</title>
</head> </head>
......
spring-boot-project/spring-boot-autoconfigure/src/test/resources/wsdl/service.wsdl
View file @ d306b31c
<?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 @@ ...@@ -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 @@ ...@@ -40,4 +40,3 @@
</wsdl:port> </wsdl:port>
</wsdl:service> </wsdl:service>
</wsdl:definitions> </wsdl:definitions>
spring-boot-project/spring-boot-autoconfigure/src/test/resources/wsdl/types.xsd
View file @ d306b31c
<?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>
spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/LiveReloadServer.java
View file @ d306b31c
...@@ -36,11 +36,10 @@ import org.apache.commons.logging.LogFactory; ...@@ -36,11 +36,10 @@ import org.apache.commons.logging.LogFactory;
import org.springframework.util.Assert; 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 * @author Phillip Webb
* @since 1.3.0 * @since 1.3.0
* @see <a href="http://livereload.com">livereload.com</a>
*/ */
public class LiveReloadServer { public class LiveReloadServer {
......
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/result/view/MustacheViewTests.java
View file @ d306b31c
...@@ -62,7 +62,7 @@ public class MustacheViewTests { ...@@ -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");
} }
} }
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/view/MustacheViewTests.java
View file @ d306b31c
...@@ -64,7 +64,7 @@ public class MustacheViewTests { ...@@ -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");
} }
} }
src/checkstyle/checkstyle-suppressions.xml
View file @ d306b31c
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN" "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
"https://checkstyle.org/dtds/suppressions_1_2.dtd"> "https://checkstyle.org/dtds/suppressions_1_2.dtd">
<suppressions> <suppressions>
<suppress files="[\\/]target[\\/]" checks=".*" />
<suppress files=".+\.[jar|git|ico|p12]" checks=".*" />
<suppress files="SpringApplicationTests\.java" checks="FinalClass" /> <suppress files="SpringApplicationTests\.java" checks="FinalClass" />
<suppress files=".+Configuration\.java" checks="HideUtilityClassConstructor" /> <suppress files=".+Configuration\.java" checks="HideUtilityClassConstructor" />
<suppress files=".+Application\.java" checks="HideUtilityClassConstructor" /> <suppress files=".+Application\.java" checks="HideUtilityClassConstructor" />
......
src/checkstyle/checkstyle.xml
View file @ d306b31c
...@@ -3,6 +3,9 @@ ...@@ -3,6 +3,9 @@
"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
"https://checkstyle.org/dtds/configuration_1_3.dtd"> "https://checkstyle.org/dtds/configuration_1_3.dtd">
<module name="com.puppycrawl.tools.checkstyle.Checker"> <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="io.spring.javaformat.checkstyle.SpringChecks" />
<module name="com.puppycrawl.tools.checkstyle.TreeWalker"> <module name="com.puppycrawl.tools.checkstyle.TreeWalker">
<module <module
......
src/checkstyle/nohttp-whitelist.txt 0 → 100644
View file @ d306b31c
^http://livereload.com/protocols/official-7$
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment