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
Hide 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-actuator/src/test/resources/db/migration/V2__update.sql
View file @ d306b31c
DROP TABLE IF EXISTS TEST; DROP TABLE IF EXISTS TEST;
\ No newline at end of file
spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V3__update.sql
View file @ d306b31c
DROP TABLE IF EXISTS TEST; DROP TABLE IF EXISTS TEST;
\ No newline at end of file
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/META-INF/mappings/non-annotated.xml
View file @ d306b31c
...@@ -15,4 +15,4 @@ ...@@ -15,4 +15,4 @@
</basic> </basic>
</attributes> </attributes>
</entity> </entity>
</entity-mappings> </entity-mappings>
\ No newline at end of file
spring-boot-project/spring-boot-autoconfigure/src/test/resources/city.sql
View file @ d306b31c
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');
\ No newline at end of file
spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-schema.ldif
View file @ d306b31c
...@@ -14,4 +14,4 @@ objectClasses: ( 1.3.6.1.4.1.32473.1.2.2 ...@@ -14,4 +14,4 @@ objectClasses: ( 1.3.6.1.4.1.32473.1.2.2
SUP top SUP top
AUXILIARY AUXILIARY
MAY exampleAttributeName MAY exampleAttributeName
X-ORIGIN 'Managing Schema Document' ) X-ORIGIN 'Managing Schema Document' )
\ No newline at end of file
spring-boot-project/spring-boot-autoconfigure/src/test/resources/data.sql
View file @ d306b31c
INSERT INTO BAR VALUES (1, 'Andy'); INSERT INTO BAR VALUES (1, 'Andy');
\ No newline at end of file
spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/non-annotated-data.sql
View file @ d306b31c
INSERT INTO NON_ANNOTATED (ID, VALUE) values (2000, 'Test'); INSERT INTO NON_ANNOTATED (ID, VALUE) values (2000, 'Test');
\ No newline at end of file
spring-boot-project/spring-boot-autoconfigure/src/test/resources/ehcache3.xml
View file @ d306b31c
...@@ -23,4 +23,4 @@ ...@@ -23,4 +23,4 @@
</expiry> </expiry>
</cache> </cache>
</config> </config>
\ No newline at end of file
spring-boot-project/spring-boot-autoconfigure/src/test/resources/logback-test.xml
View file @ d306b31c
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<configuration> <configuration>
<include resource="org/springframework/boot/logging/logback/base.xml"/> <include resource="org/springframework/boot/logging/logback/base.xml"/>
</configuration> </configuration>
\ No newline at end of file
spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/home.html
View file @ d306b31c
...@@ -6,4 +6,4 @@ ...@@ -6,4 +6,4 @@
<h2>A Message</h2> <h2>A Message</h2>
<div>{{message}} at {{time}}</div> <div>{{message}} at {{time}}</div>
</body> </body>
</html> </html>
\ No newline at end of file
spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/layout.html
View file @ d306b31c
...@@ -12,4 +12,4 @@ ...@@ -12,4 +12,4 @@
</div> </div>
<div class="jumbotron">{{#include}}{{body}}{{/include}}</div> <div class="jumbotron">{{#include}}{{body}}{{/include}}</div>
</body> </body>
</html> </html>
\ No newline at end of file
spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/partial.html
View file @ d306b31c
...@@ -12,4 +12,4 @@ ...@@ -12,4 +12,4 @@
</div> </div>
<div class="jumbotron">{{>content}}</div> <div class="jumbotron">{{>content}}</div>
</body> </body>
</html> </html>
\ No newline at end of file
spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/another.sql
View file @ d306b31c
CREATE TABLE SPAM ( CREATE TABLE SPAM (
id INTEGER IDENTITY PRIMARY KEY, id INTEGER IDENTITY PRIMARY KEY,
name VARCHAR(30), name VARCHAR(30),
); );
\ No newline at end of file
spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/data.sql
View file @ d306b31c
INSERT INTO FOO VALUES (1, 'Andy'); INSERT INTO FOO VALUES (1, 'Andy');
\ No newline at end of file
spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/encoding-data.sql
View file @ d306b31c
INSERT INTO BAR(id, name) VALUES (1, 'bar'); INSERT INTO BAR(id, name) VALUES (1, 'bar');
INSERT INTO BAR(id, name) VALUES (2, 'ばー'); INSERT INTO BAR(id, name) VALUES (2, 'ばー');
\ No newline at end of file
spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/schema.sql
View file @ d306b31c
CREATE TABLE FOO ( CREATE TABLE FOO (
id INTEGER IDENTITY PRIMARY KEY, id INTEGER IDENTITY PRIMARY KEY,
name VARCHAR(30), name VARCHAR(30),
); );
\ No newline at end of file
spring-boot-project/spring-boot-autoconfigure/src/test/resources/schema.sql
View file @ d306b31c
CREATE TABLE BAR ( CREATE TABLE BAR (
id INTEGER IDENTITY PRIMARY KEY, id INTEGER IDENTITY PRIMARY KEY,
name VARCHAR(30), name VARCHAR(30),
); );
\ No newline at end of file
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/data-dialect.html
View file @ d306b31c
<html><body data:foo="${foo}"></body></html> <html><body data:foo="${foo}"></body></html>
\ No newline at end of file
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/error/error.mustache
View file @ d306b31c
<html> <html>
<body> <body>
<ul> <ul>
<li>status: {{status}}</li> <li>status: {{status}}</li>
<li>message: {{message}}</li> <li>message: {{message}}</li>
</ul> </ul>
</body> </body>
</html> </html>
\ No newline at end of file
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/home.html
View file @ d306b31c
<html><body th:text="${foo}">Home</body></html> <html><body th:text="${foo}">Home</body></html>
\ No newline at end of file
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/java8time-dialect.html
View file @ d306b31c
<html><body th:text="${#temporals.create('2015','11','24')}"></body></html> <html><body th:text="${#temporals.create('2015','11','24')}"></body></html>
\ No newline at end of file
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/layout.html
View file @ d306b31c
...@@ -11,4 +11,4 @@ ...@@ -11,4 +11,4 @@
</div> </div>
</div> </div>
</body> </body>
</html> </html>
\ No newline at end of file
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/message.html
View file @ d306b31c
<html><body>Message: <span th:text="${greeting}">Hello</span></body></html> <html><body>Message: <span th:text="${greeting}">Hello</span></body></html>
\ No newline at end of file
spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/template.html
View file @ d306b31c
<html th:text="${foo}">foo</html> <html th:text="${foo}">foo</html>
\ No newline at end of file
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>
...@@ -7,4 +7,4 @@ ...@@ -7,4 +7,4 @@
<span th:text="${foo}">foo</span> <span th:text="${foo}">foo</span>
</div> </div>
</body> </body>
</html> </html>
\ No newline at end of file
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-cli/src/test/resources/.m2/settings.xml
View file @ d306b31c
...@@ -30,4 +30,4 @@ ...@@ -30,4 +30,4 @@
</proxy> </proxy>
</proxies> </proxies>
</settings> </settings>
\ No newline at end of file
spring-boot-project/spring-boot-cli/src/test/resources/maven-settings/encrypted/.m2/settings-security.xml
View file @ d306b31c
<settingsSecurity> <settingsSecurity>
<master>{oAyWuFO63U8HHgiplpqtgXih0/pwcRA0d+uA+Z7TBEk=}</master> <master>{oAyWuFO63U8HHgiplpqtgXih0/pwcRA0d+uA+Z7TBEk=}</master>
</settingsSecurity> </settingsSecurity>
\ No newline at end of file
spring-boot-project/spring-boot-cli/src/test/resources/maven-settings/encrypted/.m2/settings.xml
View file @ d306b31c
...@@ -28,4 +28,4 @@ ...@@ -28,4 +28,4 @@
</proxy> </proxy>
</proxies> </proxies>
</settings> </settings>
\ No newline at end of file
spring-boot-project/spring-boot-cli/src/test/resources/schema-all.sql
View file @ d306b31c
CREATE TABLE FOO ( CREATE TABLE FOO (
id INTEGER IDENTITY PRIMARY KEY, id INTEGER IDENTITY PRIMARY KEY,
name VARCHAR(30), name VARCHAR(30),
); );
\ No newline at end of file
spring-boot-project/spring-boot-cli/src/test/resources/templates/home.html
View file @ d306b31c
...@@ -22,4 +22,4 @@ ...@@ -22,4 +22,4 @@
2012 2:17:16 PM CDT</div> 2012 2:17:16 PM CDT</div>
</div> </div>
</body> </body>
</html> </html>
\ No newline at end of file
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-docs/src/test/resources/com/example/myapp/config.yml
View file @ d306b31c
test: test:
foo: foo:
bar: value bar: value
\ No newline at end of file
spring-boot-project/spring-boot-test-autoconfigure/src/test/resources/org/springframework/boot/test/autoconfigure/jdbc/schema.sql
View file @ d306b31c
create table example (id int, name varchar); create table example (id int, name varchar);
\ No newline at end of file
spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-foo2.json
View file @ d306b31c
...@@ -20,4 +20,4 @@ ...@@ -20,4 +20,4 @@
"sourceType": "org.acme.Foo2" "sourceType": "org.acme.Foo2"
} }
] ]
} }
\ No newline at end of file
spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-invalid.json
View file @ d306b31c
...@@ -5,4 +5,4 @@ ...@@ -5,4 +5,4 @@
"sourceType": "org.acme.Invalid" "sourceType": "org.acme.Invalid"
} }
] ]
} }
\ No newline at end of file
spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-root.json
View file @ d306b31c
...@@ -8,4 +8,4 @@ ...@@ -8,4 +8,4 @@
"name": "spring.root2.name" "name": "spring.root2.name"
} }
] ]
} }
\ No newline at end of file
spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/resources/org/springframework/boot/configurationsample/incremental/BarProperties.snippet
View file @ d306b31c
...@@ -6,4 +6,4 @@ ...@@ -6,4 +6,4 @@
public void setExtra(String extra) { public void setExtra(String extra) {
this.extra = extra; this.extra = extra;
} }
\ No newline at end of file
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");
} }
} }
spring-boot-project/spring-boot/src/test/resources/META-INF/spring.factories
View file @ d306b31c
org.springframework.boot.env.PropertySourceLoader=\ org.springframework.boot.env.PropertySourceLoader=\
org.springframework.boot.context.config.TestPropertySourceLoader1,\ org.springframework.boot.context.config.TestPropertySourceLoader1,\
org.springframework.boot.context.config.TestPropertySourceLoader2 org.springframework.boot.context.config.TestPropertySourceLoader2
\ No newline at end of file
spring-boot-project/spring-boot/src/test/resources/activeprofilerepro-without-override.yml
View file @ d306b31c
...@@ -8,4 +8,4 @@ version: B ...@@ -8,4 +8,4 @@ version: B
--- ---
spring.profiles: C spring.profiles: C
version: C version: C
--- ---
\ No newline at end of file
spring-boot-project/spring-boot/src/test/resources/application-withwebapplicationtype.yml
View file @ d306b31c
spring.main.web-application-type: reactive spring.main.web-application-type: reactive
\ No newline at end of file
spring-boot-project/spring-boot/src/test/resources/custom-location.yml
View file @ d306b31c
foo: ${fooValue} foo: ${fooValue}
\ No newline at end of file
spring-boot-project/spring-boot/src/test/resources/testnegatedprofiles.yml
View file @ d306b31c
...@@ -17,4 +17,4 @@ spring: ...@@ -17,4 +17,4 @@ spring:
profiles: "!other" profiles: "!other"
my: my:
property: fromnototherprofile property: fromnototherprofile
notother: foo notother: foo
\ No newline at end of file
spring-boot-project/spring-boot/src/test/resources/testprofileexpression.yml
View file @ d306b31c
...@@ -11,4 +11,4 @@ spring: ...@@ -11,4 +11,4 @@ spring:
profiles: (dev | other) & another profiles: (dev | other) & another
my: my:
property: devorotherandanother property: devorotherandanother
--- ---
\ No newline at end of file
spring-boot-project/spring-boot/src/test/resources/testprofiles.yml
View file @ d306b31c
...@@ -11,4 +11,4 @@ my: ...@@ -11,4 +11,4 @@ my:
spring: spring:
profiles: other profiles: other
my: my:
property: fromotherprofile property: fromotherprofile
\ No newline at end of file
spring-boot-project/spring-boot/src/test/resources/testprofilesdocument.yml
View file @ d306b31c
...@@ -11,4 +11,4 @@ my: ...@@ -11,4 +11,4 @@ my:
spring: spring:
profiles: other profiles: other
my: my:
property: fromotherprofile property: fromotherprofile
\ No newline at end of file
spring-boot-project/spring-boot/src/test/resources/testsetmultiprofiles.yml
View file @ d306b31c
--- ---
spring: spring:
profiles: profiles:
active: dev,healthcheck active: dev,healthcheck
\ No newline at end of file
spring-boot-project/spring-boot/src/test/resources/testsetmultiprofileslist.yml
View file @ d306b31c
...@@ -3,4 +3,4 @@ spring: ...@@ -3,4 +3,4 @@ spring:
profiles: profiles:
active: active:
- dev - dev
- healthcheck - healthcheck
\ No newline at end of file
spring-boot-project/spring-boot/src/test/resources/testsetmultiprofileswhitespace.yml
View file @ d306b31c
--- ---
spring: spring:
profiles: profiles:
active: dev, healthcheck active: dev, healthcheck
\ No newline at end of file
spring-boot-project/spring-boot/src/test/resources/testsetprofiles.yml
View file @ d306b31c
...@@ -8,4 +8,4 @@ my: ...@@ -8,4 +8,4 @@ my:
spring: spring:
profiles: dev profiles: dev
my: my:
property: fromdevprofile property: fromdevprofile
\ No newline at end of file
spring-boot-samples/spring-boot-sample-actuator-log4j2/src/main/resources/log4j2.xml
View file @ d306b31c
...@@ -18,4 +18,4 @@ ...@@ -18,4 +18,4 @@
<AppenderRef ref="Console"/> <AppenderRef ref="Console"/>
</Root> </Root>
</Loggers> </Loggers>
</Configuration> </Configuration>
\ No newline at end of file
spring-boot-samples/spring-boot-sample-cache/src/main/resources/ehcache3.xml
View file @ d306b31c
...@@ -11,4 +11,4 @@ ...@@ -11,4 +11,4 @@
<jsr107:mbeans enable-statistics="true"/> <jsr107:mbeans enable-statistics="true"/>
</cache> </cache>
</config> </config>
\ No newline at end of file
spring-boot-samples/spring-boot-sample-flyway/src/main/resources/db/migration/V1__init.sql
View file @ d306b31c
...@@ -6,4 +6,4 @@ CREATE TABLE PERSON ( ...@@ -6,4 +6,4 @@ CREATE TABLE PERSON (
create sequence person_sequence start with 1 increment by 1; create sequence person_sequence start with 1 increment by 1;
insert into PERSON (first_name, last_name) values ('Dave', 'Syer'); insert into PERSON (first_name, last_name) values ('Dave', 'Syer');
\ No newline at end of file
spring-boot-samples/spring-boot-sample-jooq/src/main/resources/reset.sql
View file @ d306b31c
DROP ALL OBJECTS; DROP ALL OBJECTS;
\ No newline at end of file
spring-boot-samples/spring-boot-sample-jpa/src/main/resources/import.sql
View file @ d306b31c
...@@ -14,4 +14,4 @@ insert into note_tags(notes_id, tags_id) values (1, 3) ...@@ -14,4 +14,4 @@ insert into note_tags(notes_id, tags_id) values (1, 3)
insert into note_tags(notes_id, tags_id) values (2, 3) insert into note_tags(notes_id, tags_id) values (2, 3)
insert into note_tags(notes_id, tags_id) values (3, 3) insert into note_tags(notes_id, tags_id) values (3, 3)
insert into note_tags(notes_id, tags_id) values (4, 2) insert into note_tags(notes_id, tags_id) values (4, 2)
insert into note_tags(notes_id, tags_id) values (4, 3) insert into note_tags(notes_id, tags_id) values (4, 3)
\ No newline at end of file
spring-boot-samples/spring-boot-sample-profile/application.yml
View file @ d306b31c
hello: Bonjour hello: Bonjour
\ No newline at end of file
spring-boot-samples/spring-boot-sample-profile/src/main/resources/application.yml
View file @ d306b31c
...@@ -4,4 +4,4 @@ name: Phil ...@@ -4,4 +4,4 @@ name: Phil
spring: spring:
profiles: goodbye,dev profiles: goodbye,dev
name: Everyone name: Everyone
\ No newline at end of file
spring-boot-samples/spring-boot-sample-web-method-security/src/main/resources/templates/login.html
View file @ d306b31c
...@@ -31,4 +31,4 @@ ...@@ -31,4 +31,4 @@
</div> </div>
</div> </div>
</body> </body>
</html> </html>
\ No newline at end of file
spring-boot-samples/spring-boot-sample-web-secure-custom/src/main/resources/templates/login.html
View file @ d306b31c
...@@ -31,4 +31,4 @@ ...@@ -31,4 +31,4 @@
</div> </div>
</div> </div>
</body> </body>
</html> </html>
\ No newline at end of file
spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/data.sql
View file @ d306b31c
insert into users (username, password, enabled) values ('user', '{noop}user', true); insert into users (username, password, enabled) values ('user', '{noop}user', true);
insert into authorities (username, authority) values ('user', 'ROLE_ADMIN'); insert into authorities (username, authority) values ('user', 'ROLE_ADMIN');
\ No newline at end of file
spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/schema.sql
View file @ d306b31c
...@@ -7,4 +7,4 @@ create table users ( ...@@ -7,4 +7,4 @@ create table users (
create table authorities ( create table authorities (
username varchar(256), username varchar(256),
authority varchar(256) authority varchar(256)
); );
\ No newline at end of file
spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/templates/login.html
View file @ d306b31c
...@@ -31,4 +31,4 @@ ...@@ -31,4 +31,4 @@
</div> </div>
</div> </div>
</body> </body>
</html> </html>
\ No newline at end of file
spring-boot-samples/spring-boot-sample-web-secure/src/main/resources/schema.sql
View file @ d306b31c
...@@ -7,4 +7,4 @@ create table users ( ...@@ -7,4 +7,4 @@ create table users (
create table authorities ( create table authorities (
username varchar(256), username varchar(256),
authority varchar(256) authority varchar(256)
); );
\ No newline at end of file
spring-boot-samples/spring-boot-sample-web-secure/src/main/resources/templates/login.html
View file @ d306b31c
...@@ -31,4 +31,4 @@ ...@@ -31,4 +31,4 @@
</div> </div>
</div> </div>
</body> </body>
</html> </html>
\ No newline at end of file
spring-boot-samples/spring-boot-sample-webservices/src/main/resources/META-INF/schemas/hr.xsd
View file @ d306b31c
...@@ -23,4 +23,4 @@ ...@@ -23,4 +23,4 @@
<xs:element name="LastName" type="xs:string"/> <xs:element name="LastName" type="xs:string"/>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:schema> </xs:schema>
\ No newline at end of file
spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-double-link-single-java-opt.sh
View file @ d306b31c
...@@ -3,4 +3,4 @@ install_double_link_service ...@@ -3,4 +3,4 @@ install_double_link_service
echo 'JAVA_OPTS=-Dserver.port=8081' > /test-service/spring-boot-app.conf echo 'JAVA_OPTS=-Dserver.port=8081' > /test-service/spring-boot-app.conf
start_service start_service
await_app http://127.0.0.1:8081/ await_app http://127.0.0.1:8081/
curl -s http://127.0.0.1:8081/ curl -s http://127.0.0.1:8081/
\ No newline at end of file
spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-relative-log-folder.sh
View file @ d306b31c
...@@ -5,4 +5,4 @@ echo 'LOG_FOLDER=log' > /test-service/spring-boot-app.conf ...@@ -5,4 +5,4 @@ echo 'LOG_FOLDER=log' > /test-service/spring-boot-app.conf
mkdir -p /test-service/log mkdir -p /test-service/log
start_service start_service
await_app await_app
[[ -s /test-service/log/spring-boot-app.log ]] && echo "Log written" [[ -s /test-service/log/spring-boot-app.log ]] && echo "Log written"
\ No newline at end of file
spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/log-file-ownership-is-changed-when-created.sh
View file @ d306b31c
...@@ -6,4 +6,4 @@ useradd andy ...@@ -6,4 +6,4 @@ useradd andy
chown andy /test-service/spring-boot-app.jar chown andy /test-service/spring-boot-app.jar
start_service start_service
await_app await_app
ls -al /test-service/log/spring-boot-app.log ls -al /test-service/log/spring-boot-app.log
\ No newline at end of file
spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/log-file-ownership-is-unchanged-when-exists.sh
View file @ d306b31c
...@@ -8,4 +8,4 @@ useradd andy ...@@ -8,4 +8,4 @@ useradd andy
chown andy /test-service/spring-boot-app.jar chown andy /test-service/spring-boot-app.jar
start_service start_service
await_app await_app
ls -al /test-service/log/spring-boot-app.log ls -al /test-service/log/spring-boot-app.log
\ No newline at end of file
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