diff --git a/pom.xml b/pom.xml index f37c22b0591..a00d7bd35bb 100644 --- a/pom.xml +++ b/pom.xml @@ -25,6 +25,7 @@ 0.0.9 + 0.0.1.RELEASE @@ -43,6 +44,11 @@ spring-javaformat-checkstyle ${spring-javaformat.version} + + io.spring.nohttp + nohttp-checkstyle + ${nohttp-checkstyle.version} + @@ -54,6 +60,7 @@ src/checkstyle/checkstyle-suppressions.xml true main.basedir=${main.basedir} + **\/*.* check diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/actuator-docs-index.html b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/actuator-docs-index.html index e69de29bb2d..8b137891791 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/actuator-docs-index.html +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/actuator-docs-index.html @@ -0,0 +1 @@ + diff --git a/spring-boot-project/spring-boot-actuator/src/test/resources/actuator-docs-index.html b/spring-boot-project/spring-boot-actuator/src/test/resources/actuator-docs-index.html index e69de29bb2d..8b137891791 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/resources/actuator-docs-index.html +++ b/spring-boot-project/spring-boot-actuator/src/test/resources/actuator-docs-index.html @@ -0,0 +1 @@ + diff --git a/spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V2__update.sql b/spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V2__update.sql index 7a4b0599d65..867c7c24f52 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V2__update.sql +++ b/spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V2__update.sql @@ -1 +1 @@ -DROP TABLE IF EXISTS TEST; \ No newline at end of file +DROP TABLE IF EXISTS TEST; diff --git a/spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V3__update.sql b/spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V3__update.sql index 7a4b0599d65..867c7c24f52 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V3__update.sql +++ b/spring-boot-project/spring-boot-actuator/src/test/resources/db/migration/V3__update.sql @@ -1 +1 @@ -DROP TABLE IF EXISTS TEST; \ No newline at end of file +DROP TABLE IF EXISTS TEST; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java index 90440d7a6cc..19b74b54cd2 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java @@ -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("bar"); }); } @@ -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(""); }); } @@ -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("2015-11-24"); }); } @@ -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("bar"); }); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java index 17cae43aa55..66fbfe47219 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java @@ -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("bar"); }); } @@ -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(""); }); } @@ -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("2015-11-24"); }); } @@ -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("bar"); }); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/mappings/non-annotated.xml b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/mappings/non-annotated.xml index 97943168397..db6bee33194 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/mappings/non-annotated.xml +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/META-INF/mappings/non-annotated.xml @@ -15,4 +15,4 @@ - \ No newline at end of file + diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/city.sql b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/city.sql index 9e0cd1cd79c..eb08623b4cf 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/city.sql +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/city.sql @@ -1 +1 @@ -INSERT INTO CITY (ID, NAME, STATE, COUNTRY, MAP) values (2000, 'Washington', 'DC', 'US', 'Google'); \ No newline at end of file +INSERT INTO CITY (ID, NAME, STATE, COUNTRY, MAP) values (2000, 'Washington', 'DC', 'US', 'Google'); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-schema.ldif b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-schema.ldif index a561a201cb1..2bb925dd6d9 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-schema.ldif +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-schema.ldif @@ -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' ) \ No newline at end of file + X-ORIGIN 'Managing Schema Document' ) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.ftl b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.ftl index 8f4052a5c9e..0d82d79c85d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.ftl +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.ftl @@ -1 +1 @@ -custom \ No newline at end of file +custom diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.html b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.html index e69de29bb2d..8b137891791 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.html +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.html @@ -0,0 +1 @@ + diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.tpl b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.tpl index 06b9992513a..cd07d3d3c64 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.tpl +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.tpl @@ -1 +1 @@ -yield "custom" \ No newline at end of file +yield "custom" diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.vm b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.vm index 8f4052a5c9e..0d82d79c85d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.vm +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/custom-templates/custom.vm @@ -1 +1 @@ -custom \ No newline at end of file +custom diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/data.sql b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/data.sql index 0d31554b97c..487614d4409 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/data.sql +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/data.sql @@ -1 +1 @@ -INSERT INTO BAR VALUES (1, 'Andy'); \ No newline at end of file +INSERT INTO BAR VALUES (1, 'Andy'); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/non-annotated-data.sql b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/non-annotated-data.sql index 481cd974acd..709bc377bcc 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/non-annotated-data.sql +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/db/non-annotated-data.sql @@ -1 +1 @@ -INSERT INTO NON_ANNOTATED (ID, VALUE) values (2000, 'Test'); \ No newline at end of file +INSERT INTO NON_ANNOTATED (ID, VALUE) values (2000, 'Test'); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/ehcache3.xml b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/ehcache3.xml index 73d27c811d5..575fd7cdbb2 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/ehcache3.xml +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/ehcache3.xml @@ -23,4 +23,4 @@ - \ No newline at end of file + diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/logback-test.xml b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/logback-test.xml index ee274734003..b8a41480d7d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/logback-test.xml +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/logback-test.xml @@ -1,4 +1,4 @@ - \ No newline at end of file + diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/foo.html b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/foo.html index 18624afa99b..fa22264e235 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/foo.html +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/foo.html @@ -1 +1 @@ -Hello {{World}} \ No newline at end of file +Hello {{World}} diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/foo_de.html b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/foo_de.html index e69de29bb2d..8b137891791 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/foo_de.html +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/foo_de.html @@ -0,0 +1 @@ + diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/home.html b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/home.html index 0e134df2ec3..a13594e5add 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/home.html +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/home.html @@ -6,4 +6,4 @@

A Message

{{message}} at {{time}}
- \ No newline at end of file + diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/layout.html b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/layout.html index 762ded630fc..31b461b33c8 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/layout.html +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/layout.html @@ -12,4 +12,4 @@
{{#include}}{{body}}{{/include}}
- \ No newline at end of file + diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/partial.html b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/partial.html index 6bea208a581..890b290340d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/partial.html +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/mustache-templates/partial.html @@ -12,4 +12,4 @@
{{>content}}
- \ No newline at end of file + diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/another.sql b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/another.sql index b96a8cbd704..8ada9cf5f3c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/another.sql +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/another.sql @@ -1,4 +1,4 @@ CREATE TABLE SPAM ( id INTEGER IDENTITY PRIMARY KEY, name VARCHAR(30), -); \ No newline at end of file +); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/data.sql b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/data.sql index d8701d1faba..068d7392cbc 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/data.sql +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/data.sql @@ -1 +1 @@ -INSERT INTO FOO VALUES (1, 'Andy'); \ No newline at end of file +INSERT INTO FOO VALUES (1, 'Andy'); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/encoding-data.sql b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/encoding-data.sql index bf46c110482..030efbf6780 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/encoding-data.sql +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/encoding-data.sql @@ -1,2 +1,2 @@ INSERT INTO BAR(id, name) VALUES (1, 'bar'); -INSERT INTO BAR(id, name) VALUES (2, 'ばー'); \ No newline at end of file +INSERT INTO BAR(id, name) VALUES (2, 'ばー'); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/schema.sql b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/schema.sql index 38de8810573..185560fe78a 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/schema.sql +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/jdbc/schema.sql @@ -1,4 +1,4 @@ CREATE TABLE FOO ( id INTEGER IDENTITY PRIMARY KEY, name VARCHAR(30), -); \ No newline at end of file +); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/web/reactive/error/templates/error/404.mustache b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/web/reactive/error/templates/error/404.mustache index e86570e1bda..36d0a671ca4 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/web/reactive/error/templates/error/404.mustache +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/web/reactive/error/templates/error/404.mustache @@ -1 +1 @@ -404 page \ No newline at end of file +404 page diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/web/reactive/error/templates/error/4xx.mustache b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/web/reactive/error/templates/error/4xx.mustache index 2e21387eb18..da8c846cd33 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/web/reactive/error/templates/error/4xx.mustache +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/web/reactive/error/templates/error/4xx.mustache @@ -1 +1 @@ -4xx page \ No newline at end of file +4xx page diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/schema.sql b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/schema.sql index fdf03687628..35b55fb6046 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/schema.sql +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/schema.sql @@ -1,4 +1,4 @@ CREATE TABLE BAR ( id INTEGER IDENTITY PRIMARY KEY, name VARCHAR(30), -); \ No newline at end of file +); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/data-dialect.html b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/data-dialect.html index 8f8a82b4081..f1a6716764a 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/data-dialect.html +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/data-dialect.html @@ -1 +1 @@ - \ No newline at end of file + diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/error/error.mustache b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/error/error.mustache index 42eec03b127..c29c825d826 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/error/error.mustache +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/error/error.mustache @@ -1,8 +1,8 @@
    -
  • status: {{status}}
    • -
  • message: {{message}}
    • +
  • status: {{status}}
    • +
  • message: {{message}}
- \ No newline at end of file + diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/home.ftl b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/home.ftl index 0247178b6e3..5e72f75cb40 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/home.ftl +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/home.ftl @@ -1 +1 @@ -home \ No newline at end of file +home diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/home.html b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/home.html index 8f364d3623a..d8a1185cc01 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/home.html +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/home.html @@ -1 +1 @@ -Home \ No newline at end of file +Home diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/home.vm b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/home.vm index 0247178b6e3..5e72f75cb40 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/home.vm +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/home.vm @@ -1 +1 @@ -home \ No newline at end of file +home diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/java8time-dialect.html b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/java8time-dialect.html index 3bba41f49b9..2c2bce877b2 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/java8time-dialect.html +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/java8time-dialect.html @@ -1 +1 @@ - \ No newline at end of file + diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/layout.html b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/layout.html index 900c0de6bd2..57add3758e6 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/layout.html +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/layout.html @@ -11,4 +11,4 @@ - \ No newline at end of file + diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/message.ftl b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/message.ftl index 3908877ab6e..b3992342b27 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/message.ftl +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/message.ftl @@ -1 +1 @@ -Message: ${greeting} \ No newline at end of file +Message: ${greeting} diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/message.html b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/message.html index 53440f08e73..ba236128ec2 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/message.html +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/message.html @@ -1 +1 @@ -Message: Hello \ No newline at end of file +Message: Hello diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/message.vm b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/message.vm index 3908877ab6e..b3992342b27 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/message.vm +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/message.vm @@ -1 +1 @@ -Message: ${greeting} \ No newline at end of file +Message: ${greeting} diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.ftl b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.ftl index ba8db465da2..278ed403330 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.ftl +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.ftl @@ -1 +1 @@ -prefixed \ No newline at end of file +prefixed diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.tpl b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.tpl index c9c6c42d6c9..05426ef6995 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.tpl +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.tpl @@ -1 +1 @@ -yield "prefixed" \ No newline at end of file +yield "prefixed" diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.vm b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.vm index ba8db465da2..278ed403330 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.vm +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/prefix/prefixed.vm @@ -1 +1 @@ -prefixed \ No newline at end of file +prefixed diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/suffixed.freemarker b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/suffixed.freemarker index dcce46b0270..cfe8d439ab1 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/suffixed.freemarker +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/suffixed.freemarker @@ -1 +1 @@ -suffixed \ No newline at end of file +suffixed diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/template.html b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/template.html index 294ec94e2d7..123f6966f70 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/template.html +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/template.html @@ -1 +1 @@ -foo \ No newline at end of file +foo diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/view.html b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/view.html index 6f4deeb420e..4ff0e133524 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/view.html +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/templates/view.html @@ -1,4 +1,4 @@ - + Content @@ -7,4 +7,4 @@ foo - \ No newline at end of file + diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/welcome-page/index.html b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/welcome-page/index.html index e69de29bb2d..8b137891791 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/welcome-page/index.html +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/welcome-page/index.html @@ -0,0 +1 @@ + diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/wsdl/service.wsdl b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/wsdl/service.wsdl index 7daeeabdc11..639bba01399 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/wsdl/service.wsdl +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/wsdl/service.wsdl @@ -1,10 +1,10 @@ - + - + @@ -23,7 +23,7 @@ + transport="https://schemas.xmlsoap.org/soap/http/" /> @@ -40,4 +40,3 @@ - diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/wsdl/types.xsd b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/wsdl/types.xsd index a289fe8d100..dc559d26b73 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/wsdl/types.xsd +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/wsdl/types.xsd @@ -1,7 +1,7 @@ + targetNamespace="https://www.springframework.org/spring-ws/wsdl/schemas"> diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/.m2/settings.xml b/spring-boot-project/spring-boot-cli/src/test/resources/.m2/settings.xml index 6cc8d41bd2a..8ae764f39d3 100644 --- a/spring-boot-project/spring-boot-cli/src/test/resources/.m2/settings.xml +++ b/spring-boot-project/spring-boot-cli/src/test/resources/.m2/settings.xml @@ -30,4 +30,4 @@ - \ No newline at end of file + diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/maven-settings/encrypted/.m2/settings-security.xml b/spring-boot-project/spring-boot-cli/src/test/resources/maven-settings/encrypted/.m2/settings-security.xml index 7b6597c44e9..e1b5cd3c1b4 100644 --- a/spring-boot-project/spring-boot-cli/src/test/resources/maven-settings/encrypted/.m2/settings-security.xml +++ b/spring-boot-project/spring-boot-cli/src/test/resources/maven-settings/encrypted/.m2/settings-security.xml @@ -1,3 +1,3 @@ {oAyWuFO63U8HHgiplpqtgXih0/pwcRA0d+uA+Z7TBEk=} - \ No newline at end of file + diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/maven-settings/encrypted/.m2/settings.xml b/spring-boot-project/spring-boot-cli/src/test/resources/maven-settings/encrypted/.m2/settings.xml index 5160df56576..e9c2b39cf3b 100644 --- a/spring-boot-project/spring-boot-cli/src/test/resources/maven-settings/encrypted/.m2/settings.xml +++ b/spring-boot-project/spring-boot-cli/src/test/resources/maven-settings/encrypted/.m2/settings.xml @@ -28,4 +28,4 @@ - \ No newline at end of file + diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/two/.file b/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/two/.file index e69de29bb2d..8b137891791 100644 --- a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/two/.file +++ b/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/two/.file @@ -0,0 +1 @@ + diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/schema-all.sql b/spring-boot-project/spring-boot-cli/src/test/resources/schema-all.sql index 38de8810573..185560fe78a 100644 --- a/spring-boot-project/spring-boot-cli/src/test/resources/schema-all.sql +++ b/spring-boot-project/spring-boot-cli/src/test/resources/schema-all.sql @@ -1,4 +1,4 @@ CREATE TABLE FOO ( id INTEGER IDENTITY PRIMARY KEY, name VARCHAR(30), -); \ No newline at end of file +); diff --git a/spring-boot-project/spring-boot-cli/src/test/resources/templates/home.html b/spring-boot-project/spring-boot-cli/src/test/resources/templates/home.html index dfdd6c756b5..c1058eb1c5f 100644 --- a/spring-boot-project/spring-boot-cli/src/test/resources/templates/home.html +++ b/spring-boot-project/spring-boot-cli/src/test/resources/templates/home.html @@ -22,4 +22,4 @@ 2012 2:17:16 PM CDT - \ No newline at end of file + diff --git a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/LiveReloadServer.java b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/LiveReloadServer.java index c27163ccd25..9b65417708f 100644 --- a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/LiveReloadServer.java +++ b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/LiveReloadServer.java @@ -36,11 +36,10 @@ import org.apache.commons.logging.LogFactory; import org.springframework.util.Assert; /** - * A livereload server. + * A livereload server. * * @author Phillip Webb * @since 1.3.0 - * @see livereload.com */ public class LiveReloadServer { diff --git a/spring-boot-project/spring-boot-docs/src/test/resources/com/example/myapp/config.yml b/spring-boot-project/spring-boot-docs/src/test/resources/com/example/myapp/config.yml index 6a907d9dfc6..befe45ca359 100644 --- a/spring-boot-project/spring-boot-docs/src/test/resources/com/example/myapp/config.yml +++ b/spring-boot-project/spring-boot-docs/src/test/resources/com/example/myapp/config.yml @@ -1,3 +1,3 @@ test: foo: - bar: value \ No newline at end of file + bar: value diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/resources/org/springframework/boot/test/autoconfigure/jdbc/schema.sql b/spring-boot-project/spring-boot-test-autoconfigure/src/test/resources/org/springframework/boot/test/autoconfigure/jdbc/schema.sql index c7559fe8cc7..8b9e6aede2a 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/resources/org/springframework/boot/test/autoconfigure/jdbc/schema.sql +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/resources/org/springframework/boot/test/autoconfigure/jdbc/schema.sql @@ -1 +1 @@ -create table example (id int, name varchar); \ No newline at end of file +create table example (id int, name varchar); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-bar.json b/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-bar.json index 6f07ce19ba9..6404622bcfc 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-bar.json +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-bar.json @@ -62,4 +62,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-deprecated.json b/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-deprecated.json index af288967e19..65137fc4ffb 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-deprecated.json +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-deprecated.json @@ -35,4 +35,4 @@ } } ] -} \ No newline at end of file +} diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-empty.json b/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-empty.json index b42f309e7ae..c8c4105eb57 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-empty.json +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-empty.json @@ -1,3 +1,3 @@ { "foo": "bar" -} \ No newline at end of file +} diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-foo.json b/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-foo.json index 74b1c57bfb7..22fc37507c4 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-foo.json +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-foo.json @@ -56,4 +56,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-foo2.json b/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-foo2.json index a57f4992cfd..33e89c49c10 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-foo2.json +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-foo2.json @@ -20,4 +20,4 @@ "sourceType": "org.acme.Foo2" } ] -} \ No newline at end of file +} diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-invalid.json b/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-invalid.json index ca2f0711151..1d6b5f5c5c6 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-invalid.json +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-invalid.json @@ -5,4 +5,4 @@ "sourceType": "org.acme.Invalid" } ] -} \ No newline at end of file +} diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-map.json b/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-map.json index 599ed64f194..9901874b4b5 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-map.json +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-map.json @@ -76,4 +76,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-root.json b/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-root.json index 8fced8db7c0..9b3c0118f63 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-root.json +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-metadata/src/test/resources/metadata/configuration-metadata-root.json @@ -8,4 +8,4 @@ "name": "spring.root2.name" } ] -} \ No newline at end of file +} diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/resources/org/springframework/boot/configurationsample/incremental/BarProperties.snippet b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/resources/org/springframework/boot/configurationsample/incremental/BarProperties.snippet index a9f7727aa60..57ce101c56f 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/resources/org/springframework/boot/configurationsample/incremental/BarProperties.snippet +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/resources/org/springframework/boot/configurationsample/incremental/BarProperties.snippet @@ -6,4 +6,4 @@ public void setExtra(String extra) { this.extra = extra; - } \ No newline at end of file + } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/resources/example.script b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/resources/example.script index 15c36f50ef7..6ac867af71b 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/resources/example.script +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader-tools/src/test/resources/example.script @@ -1 +1 @@ -FOO=BAR \ No newline at end of file +FOO=BAR diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/resources/root/META-INF/MANIFEST.MF b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/resources/root/META-INF/MANIFEST.MF index e69de29bb2d..8b137891791 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/resources/root/META-INF/MANIFEST.MF +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/resources/root/META-INF/MANIFEST.MF @@ -0,0 +1 @@ + diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/result/view/MustacheViewTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/result/view/MustacheViewTests.java index 2de80b931b4..1a4512c8bda 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/result/view/MustacheViewTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/result/view/MustacheViewTests.java @@ -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"); } } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/view/MustacheViewTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/view/MustacheViewTests.java index aec312fc51a..546ff90607d 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/view/MustacheViewTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/view/MustacheViewTests.java @@ -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"); } } diff --git a/spring-boot-project/spring-boot/src/test/resources/META-INF/spring.factories b/spring-boot-project/spring-boot/src/test/resources/META-INF/spring.factories index 28089105706..7be3145156b 100644 --- a/spring-boot-project/spring-boot/src/test/resources/META-INF/spring.factories +++ b/spring-boot-project/spring-boot/src/test/resources/META-INF/spring.factories @@ -1,3 +1,3 @@ org.springframework.boot.env.PropertySourceLoader=\ org.springframework.boot.context.config.TestPropertySourceLoader1,\ -org.springframework.boot.context.config.TestPropertySourceLoader2 \ No newline at end of file +org.springframework.boot.context.config.TestPropertySourceLoader2 diff --git a/spring-boot-project/spring-boot/src/test/resources/activeprofilerepro-without-override.yml b/spring-boot-project/spring-boot/src/test/resources/activeprofilerepro-without-override.yml index 3c0a9e151fe..2640af09e40 100644 --- a/spring-boot-project/spring-boot/src/test/resources/activeprofilerepro-without-override.yml +++ b/spring-boot-project/spring-boot/src/test/resources/activeprofilerepro-without-override.yml @@ -8,4 +8,4 @@ version: B --- spring.profiles: C version: C ---- \ No newline at end of file +--- diff --git a/spring-boot-project/spring-boot/src/test/resources/application-withwebapplicationtype.yml b/spring-boot-project/spring-boot/src/test/resources/application-withwebapplicationtype.yml index 9c913ff8db5..1556b9eca16 100644 --- a/spring-boot-project/spring-boot/src/test/resources/application-withwebapplicationtype.yml +++ b/spring-boot-project/spring-boot/src/test/resources/application-withwebapplicationtype.yml @@ -1 +1 @@ -spring.main.web-application-type: reactive \ No newline at end of file +spring.main.web-application-type: reactive diff --git a/spring-boot-project/spring-boot/src/test/resources/custom-location.yml b/spring-boot-project/spring-boot/src/test/resources/custom-location.yml index 60000ea2327..69a69615994 100644 --- a/spring-boot-project/spring-boot/src/test/resources/custom-location.yml +++ b/spring-boot-project/spring-boot/src/test/resources/custom-location.yml @@ -1 +1 @@ -foo: ${fooValue} \ No newline at end of file +foo: ${fooValue} diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/reactive/result/view/template.html b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/reactive/result/view/template.html index 18624afa99b..fa22264e235 100644 --- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/reactive/result/view/template.html +++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/reactive/result/view/template.html @@ -1 +1 @@ -Hello {{World}} \ No newline at end of file +Hello {{World}} diff --git a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/servlet/view/template.html b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/servlet/view/template.html index 18624afa99b..fa22264e235 100644 --- a/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/servlet/view/template.html +++ b/spring-boot-project/spring-boot/src/test/resources/org/springframework/boot/web/servlet/view/template.html @@ -1 +1 @@ -Hello {{World}} \ No newline at end of file +Hello {{World}} diff --git a/spring-boot-project/spring-boot/src/test/resources/testnegatedprofiles.yml b/spring-boot-project/spring-boot/src/test/resources/testnegatedprofiles.yml index a015a0749e3..79e1a4367d0 100644 --- a/spring-boot-project/spring-boot/src/test/resources/testnegatedprofiles.yml +++ b/spring-boot-project/spring-boot/src/test/resources/testnegatedprofiles.yml @@ -17,4 +17,4 @@ spring: profiles: "!other" my: property: fromnototherprofile - notother: foo \ No newline at end of file + notother: foo diff --git a/spring-boot-project/spring-boot/src/test/resources/testprofileexpression.yml b/spring-boot-project/spring-boot/src/test/resources/testprofileexpression.yml index 78ddcfe64e3..d43f9b0523f 100644 --- a/spring-boot-project/spring-boot/src/test/resources/testprofileexpression.yml +++ b/spring-boot-project/spring-boot/src/test/resources/testprofileexpression.yml @@ -11,4 +11,4 @@ spring: profiles: (dev | other) & another my: property: devorotherandanother ---- \ No newline at end of file +--- diff --git a/spring-boot-project/spring-boot/src/test/resources/testprofiles.yml b/spring-boot-project/spring-boot/src/test/resources/testprofiles.yml index 74af5c33c15..cb6cde27e61 100644 --- a/spring-boot-project/spring-boot/src/test/resources/testprofiles.yml +++ b/spring-boot-project/spring-boot/src/test/resources/testprofiles.yml @@ -11,4 +11,4 @@ my: spring: profiles: other my: - property: fromotherprofile \ No newline at end of file + property: fromotherprofile diff --git a/spring-boot-project/spring-boot/src/test/resources/testprofilesdocument.yml b/spring-boot-project/spring-boot/src/test/resources/testprofilesdocument.yml index 0093d6274c9..f74b31e0780 100644 --- a/spring-boot-project/spring-boot/src/test/resources/testprofilesdocument.yml +++ b/spring-boot-project/spring-boot/src/test/resources/testprofilesdocument.yml @@ -11,4 +11,4 @@ my: spring: profiles: other my: - property: fromotherprofile \ No newline at end of file + property: fromotherprofile diff --git a/spring-boot-project/spring-boot/src/test/resources/testsetmultiprofiles.yml b/spring-boot-project/spring-boot/src/test/resources/testsetmultiprofiles.yml index 462f9d87856..348c27211cd 100644 --- a/spring-boot-project/spring-boot/src/test/resources/testsetmultiprofiles.yml +++ b/spring-boot-project/spring-boot/src/test/resources/testsetmultiprofiles.yml @@ -1,4 +1,4 @@ --- spring: profiles: - active: dev,healthcheck \ No newline at end of file + active: dev,healthcheck diff --git a/spring-boot-project/spring-boot/src/test/resources/testsetmultiprofileslist.yml b/spring-boot-project/spring-boot/src/test/resources/testsetmultiprofileslist.yml index 02deecd5bae..f5373631604 100644 --- a/spring-boot-project/spring-boot/src/test/resources/testsetmultiprofileslist.yml +++ b/spring-boot-project/spring-boot/src/test/resources/testsetmultiprofileslist.yml @@ -3,4 +3,4 @@ spring: profiles: active: - dev - - healthcheck \ No newline at end of file + - healthcheck diff --git a/spring-boot-project/spring-boot/src/test/resources/testsetmultiprofileswhitespace.yml b/spring-boot-project/spring-boot/src/test/resources/testsetmultiprofileswhitespace.yml index 8b31dc528c5..cbce97c5104 100644 --- a/spring-boot-project/spring-boot/src/test/resources/testsetmultiprofileswhitespace.yml +++ b/spring-boot-project/spring-boot/src/test/resources/testsetmultiprofileswhitespace.yml @@ -1,4 +1,4 @@ --- spring: profiles: - active: dev, healthcheck \ No newline at end of file + active: dev, healthcheck diff --git a/spring-boot-project/spring-boot/src/test/resources/testsetprofiles.yml b/spring-boot-project/spring-boot/src/test/resources/testsetprofiles.yml index 4ec697ea3db..48c5f02a84c 100644 --- a/spring-boot-project/spring-boot/src/test/resources/testsetprofiles.yml +++ b/spring-boot-project/spring-boot/src/test/resources/testsetprofiles.yml @@ -8,4 +8,4 @@ my: spring: profiles: dev my: - property: fromdevprofile \ No newline at end of file + property: fromdevprofile diff --git a/spring-boot-samples/spring-boot-sample-actuator-log4j2/src/main/resources/log4j2.xml b/spring-boot-samples/spring-boot-sample-actuator-log4j2/src/main/resources/log4j2.xml index 2f385bde1aa..dfec9acb0a7 100644 --- a/spring-boot-samples/spring-boot-sample-actuator-log4j2/src/main/resources/log4j2.xml +++ b/spring-boot-samples/spring-boot-sample-actuator-log4j2/src/main/resources/log4j2.xml @@ -18,4 +18,4 @@ - \ No newline at end of file + diff --git a/spring-boot-samples/spring-boot-sample-cache/src/main/resources/ehcache3.xml b/spring-boot-samples/spring-boot-sample-cache/src/main/resources/ehcache3.xml index cce17bb79e1..4847f1f118b 100644 --- a/spring-boot-samples/spring-boot-sample-cache/src/main/resources/ehcache3.xml +++ b/spring-boot-samples/spring-boot-sample-cache/src/main/resources/ehcache3.xml @@ -11,4 +11,4 @@ - \ No newline at end of file + diff --git a/spring-boot-samples/spring-boot-sample-flyway/src/main/resources/db/migration/V1__init.sql b/spring-boot-samples/spring-boot-sample-flyway/src/main/resources/db/migration/V1__init.sql index ff78aa69cf9..a38f935c3d5 100644 --- a/spring-boot-samples/spring-boot-sample-flyway/src/main/resources/db/migration/V1__init.sql +++ b/spring-boot-samples/spring-boot-sample-flyway/src/main/resources/db/migration/V1__init.sql @@ -6,4 +6,4 @@ CREATE TABLE PERSON ( create sequence person_sequence start with 1 increment by 1; -insert into PERSON (first_name, last_name) values ('Dave', 'Syer'); \ No newline at end of file +insert into PERSON (first_name, last_name) values ('Dave', 'Syer'); diff --git a/spring-boot-samples/spring-boot-sample-jooq/src/main/resources/reset.sql b/spring-boot-samples/spring-boot-sample-jooq/src/main/resources/reset.sql index fc9a4f21daf..b1306d7359c 100644 --- a/spring-boot-samples/spring-boot-sample-jooq/src/main/resources/reset.sql +++ b/spring-boot-samples/spring-boot-sample-jooq/src/main/resources/reset.sql @@ -1 +1 @@ -DROP ALL OBJECTS; \ No newline at end of file +DROP ALL OBJECTS; diff --git a/spring-boot-samples/spring-boot-sample-jpa/src/main/resources/import.sql b/spring-boot-samples/spring-boot-sample-jpa/src/main/resources/import.sql index 6917db6f51f..97c530c276e 100644 --- a/spring-boot-samples/spring-boot-sample-jpa/src/main/resources/import.sql +++ b/spring-boot-samples/spring-boot-sample-jpa/src/main/resources/import.sql @@ -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 (3, 3) insert into note_tags(notes_id, tags_id) values (4, 2) -insert into note_tags(notes_id, tags_id) values (4, 3) \ No newline at end of file +insert into note_tags(notes_id, tags_id) values (4, 3) diff --git a/spring-boot-samples/spring-boot-sample-profile/application.yml b/spring-boot-samples/spring-boot-sample-profile/application.yml index 6d4e66da9c4..8689513d3b1 100644 --- a/spring-boot-samples/spring-boot-sample-profile/application.yml +++ b/spring-boot-samples/spring-boot-sample-profile/application.yml @@ -1 +1 @@ -hello: Bonjour \ No newline at end of file +hello: Bonjour diff --git a/spring-boot-samples/spring-boot-sample-profile/src/main/resources/application.yml b/spring-boot-samples/spring-boot-sample-profile/src/main/resources/application.yml index 316b1f95d9d..f0f58213812 100644 --- a/spring-boot-samples/spring-boot-sample-profile/src/main/resources/application.yml +++ b/spring-boot-samples/spring-boot-sample-profile/src/main/resources/application.yml @@ -4,4 +4,4 @@ name: Phil spring: profiles: goodbye,dev -name: Everyone \ No newline at end of file +name: Everyone diff --git a/spring-boot-samples/spring-boot-sample-web-method-security/src/main/resources/templates/login.html b/spring-boot-samples/spring-boot-sample-web-method-security/src/main/resources/templates/login.html index 96b02cb7a38..cace46a3606 100644 --- a/spring-boot-samples/spring-boot-sample-web-method-security/src/main/resources/templates/login.html +++ b/spring-boot-samples/spring-boot-sample-web-method-security/src/main/resources/templates/login.html @@ -31,4 +31,4 @@ - \ No newline at end of file + diff --git a/spring-boot-samples/spring-boot-sample-web-secure-custom/src/main/resources/templates/login.html b/spring-boot-samples/spring-boot-sample-web-secure-custom/src/main/resources/templates/login.html index 96b02cb7a38..cace46a3606 100644 --- a/spring-boot-samples/spring-boot-sample-web-secure-custom/src/main/resources/templates/login.html +++ b/spring-boot-samples/spring-boot-sample-web-secure-custom/src/main/resources/templates/login.html @@ -31,4 +31,4 @@ - \ No newline at end of file + diff --git a/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/data.sql b/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/data.sql index fda9e9680e7..6e221af090c 100644 --- a/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/data.sql +++ b/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/data.sql @@ -1,3 +1,3 @@ insert into users (username, password, enabled) values ('user', '{noop}user', true); -insert into authorities (username, authority) values ('user', 'ROLE_ADMIN'); \ No newline at end of file +insert into authorities (username, authority) values ('user', 'ROLE_ADMIN'); diff --git a/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/schema.sql b/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/schema.sql index cf6c5fdda60..00b20c8d334 100644 --- a/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/schema.sql +++ b/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/schema.sql @@ -7,4 +7,4 @@ create table users ( create table authorities ( username varchar(256), authority varchar(256) -); \ No newline at end of file +); diff --git a/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/templates/login.html b/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/templates/login.html index 96b02cb7a38..cace46a3606 100644 --- a/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/templates/login.html +++ b/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/main/resources/templates/login.html @@ -31,4 +31,4 @@ - \ No newline at end of file + diff --git a/spring-boot-samples/spring-boot-sample-web-secure/src/main/resources/schema.sql b/spring-boot-samples/spring-boot-sample-web-secure/src/main/resources/schema.sql index cf6c5fdda60..00b20c8d334 100644 --- a/spring-boot-samples/spring-boot-sample-web-secure/src/main/resources/schema.sql +++ b/spring-boot-samples/spring-boot-sample-web-secure/src/main/resources/schema.sql @@ -7,4 +7,4 @@ create table users ( create table authorities ( username varchar(256), authority varchar(256) -); \ No newline at end of file +); diff --git a/spring-boot-samples/spring-boot-sample-web-secure/src/main/resources/templates/login.html b/spring-boot-samples/spring-boot-sample-web-secure/src/main/resources/templates/login.html index 96b02cb7a38..cace46a3606 100644 --- a/spring-boot-samples/spring-boot-sample-web-secure/src/main/resources/templates/login.html +++ b/spring-boot-samples/spring-boot-sample-web-secure/src/main/resources/templates/login.html @@ -31,4 +31,4 @@ - \ No newline at end of file + diff --git a/spring-boot-samples/spring-boot-sample-webservices/src/main/resources/META-INF/schemas/hr.xsd b/spring-boot-samples/spring-boot-sample-webservices/src/main/resources/META-INF/schemas/hr.xsd index 2c32e433c4a..b27b7bf48c6 100644 --- a/spring-boot-samples/spring-boot-sample-webservices/src/main/resources/META-INF/schemas/hr.xsd +++ b/spring-boot-samples/spring-boot-sample-webservices/src/main/resources/META-INF/schemas/hr.xsd @@ -23,4 +23,4 @@ - \ No newline at end of file + diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-double-link-single-java-opt.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-double-link-single-java-opt.sh index 9f1f5c404d0..6895c0d0613 100755 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-double-link-single-java-opt.sh +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-double-link-single-java-opt.sh @@ -3,4 +3,4 @@ install_double_link_service echo 'JAVA_OPTS=-Dserver.port=8081' > /test-service/spring-boot-app.conf start_service await_app http://127.0.0.1:8081/ -curl -s http://127.0.0.1:8081/ \ No newline at end of file +curl -s http://127.0.0.1:8081/ diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-relative-log-folder.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-relative-log-folder.sh index 4f44ee3d2c0..da1f7b11c10 100755 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-relative-log-folder.sh +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/launch-with-relative-log-folder.sh @@ -5,4 +5,4 @@ echo 'LOG_FOLDER=log' > /test-service/spring-boot-app.conf mkdir -p /test-service/log start_service await_app -[[ -s /test-service/log/spring-boot-app.log ]] && echo "Log written" \ No newline at end of file +[[ -s /test-service/log/spring-boot-app.log ]] && echo "Log written" diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/log-file-ownership-is-changed-when-created.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/log-file-ownership-is-changed-when-created.sh index c007f35cadc..5cc9eb46fc6 100755 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/log-file-ownership-is-changed-when-created.sh +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/log-file-ownership-is-changed-when-created.sh @@ -6,4 +6,4 @@ useradd andy chown andy /test-service/spring-boot-app.jar start_service await_app -ls -al /test-service/log/spring-boot-app.log \ No newline at end of file +ls -al /test-service/log/spring-boot-app.log diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/log-file-ownership-is-unchanged-when-exists.sh b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/log-file-ownership-is-unchanged-when-exists.sh index ec28e35ac2f..685e1e6100f 100755 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/log-file-ownership-is-unchanged-when-exists.sh +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/resources/scripts/log-file-ownership-is-unchanged-when-exists.sh @@ -8,4 +8,4 @@ useradd andy chown andy /test-service/spring-boot-app.jar start_service await_app -ls -al /test-service/log/spring-boot-app.log \ No newline at end of file +ls -al /test-service/log/spring-boot-app.log diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml index 858ed62c323..0be213a211a 100644 --- a/src/checkstyle/checkstyle-suppressions.xml +++ b/src/checkstyle/checkstyle-suppressions.xml @@ -3,6 +3,8 @@ "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN" "https://checkstyle.org/dtds/suppressions_1_2.dtd"> + + diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml index a47244b99ac..0d489df93db 100644 --- a/src/checkstyle/checkstyle.xml +++ b/src/checkstyle/checkstyle.xml @@ -3,6 +3,9 @@ "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd"> + + +