From 80d8a5cfa24cf8269b1593d58b62eb9d177c7045 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Mon, 3 Jun 2019 23:51:08 -0700
Subject: [PATCH] Add nohttp checkstyle rule

Closes gh-16682
---
 spring-boot-parent/pom.xml                             | 10 +++++++++-
 .../src/checkstyle/checkstyle-suppressions.xml         |  6 ++++--
 spring-boot-parent/src/checkstyle/checkstyle.xml       |  3 +++
 spring-boot-parent/src/checkstyle/nohttp-whitelist.txt |  1 +
 spring-boot-samples/pom.xml                            |  8 ++++++++
 5 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 spring-boot-parent/src/checkstyle/nohttp-whitelist.txt

diff --git a/spring-boot-parent/pom.xml b/spring-boot-parent/pom.xml
index 2e7d3df764..56b663d381 100644
--- a/spring-boot-parent/pom.xml
+++ b/spring-boot-parent/pom.xml
@@ -17,7 +17,7 @@
 		<url>https://www.spring.io</url>
 	</organization>
 	<properties>
-		<main.basedir>..</main.basedir>
+		<main.basedir>${basedir}/..</main.basedir>
 		<disable.checks>false</disable.checks>
 		<java.version>1.6</java.version>
 		<aether.version>1.0.2.v20150114</aether.version>
@@ -25,6 +25,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<maven.version>3.1.1</maven.version>
 		<spring-javaformat.version>0.0.9</spring-javaformat.version>
+		<nohttp-checkstyle.version>0.0.1.RELEASE</nohttp-checkstyle.version>
 	</properties>
 	<scm>
 		<url>https://github.com/spring-projects/spring-boot</url>
@@ -318,6 +319,11 @@
 							<artifactId>spring-javaformat-checkstyle</artifactId>
 							<version>${spring-javaformat.version}</version>
 						</dependency>
+						<dependency>
+							<groupId>io.spring.nohttp</groupId>
+							<artifactId>nohttp-checkstyle</artifactId>
+							<version>${nohttp-checkstyle.version}</version>
+						</dependency>
 					</dependencies>
 				</plugin>
 				<plugin>
@@ -533,6 +539,8 @@
 							<configLocation>src/checkstyle/checkstyle.xml</configLocation>
 							<suppressionsLocation>src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
 							<includeTestSourceDirectory>true</includeTestSourceDirectory>
+							<propertyExpansion>main.basedir=${main.basedir}</propertyExpansion>
+							<resourceIncludes>**\/*.*</resourceIncludes>
 						</configuration>
 						<goals>
 							<goal>check</goal>
diff --git a/spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml b/spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml
index 94b7e7e62c..38fbb7d737 100644
--- a/spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml
+++ b/spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE suppressions PUBLIC
-    "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
-    "https://checkstyle.org/dtds/suppressions_1_2.dtd">
+	"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
+	"https://checkstyle.org/dtds/suppressions_1_2.dtd">
 <suppressions>
+<suppress files="[\\/]target[\\/]" checks=".*" />
+	<suppress files=".+\.[jar|git|ico|p12]" checks=".*" />
 	<suppress files="SpringApplicationTests\.java" checks="FinalClass" />
 	<suppress files=".+Configuration\.java" checks="HideUtilityClassConstructor" />
 	<suppress files=".+Application\.java" checks="HideUtilityClassConstructor" />
diff --git a/spring-boot-parent/src/checkstyle/checkstyle.xml b/spring-boot-parent/src/checkstyle/checkstyle.xml
index 7eba2cff9e..9bc8ad31b5 100644
--- a/spring-boot-parent/src/checkstyle/checkstyle.xml
+++ b/spring-boot-parent/src/checkstyle/checkstyle.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "https://checkstyle.org/dtds/configuration_1_2.dtd">
 <module name="com.puppycrawl.tools.checkstyle.Checker">
+	<module name="io.spring.nohttp.checkstyle.check.NoHttpCheck">
+		<property name="whitelistFileName" value="${main.basedir}/spring-boot-parent/src/checkstyle/nohttp-whitelist.txt"/>
+	</module>
 	<module name="io.spring.javaformat.checkstyle.SpringChecks" />
 	<module name="com.puppycrawl.tools.checkstyle.TreeWalker">
 		<module name="com.puppycrawl.tools.checkstyle.checks.imports.IllegalImportCheck">
diff --git a/spring-boot-parent/src/checkstyle/nohttp-whitelist.txt b/spring-boot-parent/src/checkstyle/nohttp-whitelist.txt
new file mode 100644
index 0000000000..79936fb7c7
--- /dev/null
+++ b/spring-boot-parent/src/checkstyle/nohttp-whitelist.txt
@@ -0,0 +1 @@
+^http://livereload.com/protocols/official-7$
diff --git a/spring-boot-samples/pom.xml b/spring-boot-samples/pom.xml
index 061c7a8c36..a771fbc9be 100644
--- a/spring-boot-samples/pom.xml
+++ b/spring-boot-samples/pom.xml
@@ -20,6 +20,7 @@
 		<main.basedir>${basedir}/..</main.basedir>
 		<java.version>1.8</java.version>
 		<spring-javaformat.version>0.0.9</spring-javaformat.version>
+		<nohttp-checkstyle.version>0.0.1.RELEASE</nohttp-checkstyle.version>
 		<disable.checks>false</disable.checks>
 	</properties>
 	<modules>
@@ -155,6 +156,11 @@
 						<artifactId>spring-javaformat-checkstyle</artifactId>
 						<version>${spring-javaformat.version}</version>
 					</dependency>
+					<dependency>
+						<groupId>io.spring.nohttp</groupId>
+						<artifactId>nohttp-checkstyle</artifactId>
+						<version>${nohttp-checkstyle.version}</version>
+					</dependency>
 				</dependencies>
 				<executions>
 					<execution>
@@ -165,6 +171,8 @@
 							<configLocation>../spring-boot-parent/src/checkstyle/checkstyle.xml</configLocation>
 							<suppressionsLocation>../spring-boot-parent/src/checkstyle/checkstyle-suppressions.xml</suppressionsLocation>
 							<includeTestSourceDirectory>true</includeTestSourceDirectory>
+							<propertyExpansion>main.basedir=${main.basedir}</propertyExpansion>
+							<resourceIncludes>**\/*.*</resourceIncludes>
 						</configuration>
 						<goals>
 							<goal>check</goal>