From 3818b5b05e22715d0069e5d929fa2399eec94a0c Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Sun, 17 Mar 2019 11:22:36 +0100
Subject: [PATCH] Add rule to prevent Spring conventions to be imported

See gh-871
---
 initializr-generator-spring/pom.xml |  4 ++++
 pom.xml                             |  3 ++-
 src/checkstyle/checkstyle.xml       | 22 ++++++++++++++++++++++
 src/checkstyle/import-control.xml   | 12 ++++++++++++
 4 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 src/checkstyle/checkstyle.xml
 create mode 100644 src/checkstyle/import-control.xml

diff --git a/initializr-generator-spring/pom.xml b/initializr-generator-spring/pom.xml
index fc7d0807..b13d194a 100644
--- a/initializr-generator-spring/pom.xml
+++ b/initializr-generator-spring/pom.xml
@@ -9,6 +9,10 @@
 	<artifactId>initializr-generator-spring</artifactId>
 	<name>Spring Initializr :: Generator (Spring projects)</name>
 
+	<properties>
+		<main.basedir>${basedir}/..</main.basedir>
+	</properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>io.spring.initializr</groupId>
diff --git a/pom.xml b/pom.xml
index cb15c84d..d082d312 100644
--- a/pom.xml
+++ b/pom.xml
@@ -193,8 +193,9 @@
 						<phase>validate</phase>
 						<configuration>
 							<skip>${disable.checks}</skip>
-							<configLocation>io/spring/javaformat/checkstyle/checkstyle.xml</configLocation>
+							<configLocation>src/checkstyle/checkstyle.xml</configLocation>
 							<includeTestSourceDirectory>true</includeTestSourceDirectory>
+							<propertyExpansion>main.basedir=${main.basedir}</propertyExpansion>
 						</configuration>
 						<goals>
 							<goal>check</goal>
diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml
new file mode 100644
index 00000000..63433b6f
--- /dev/null
+++ b/src/checkstyle/checkstyle.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
+		"http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+<module name="com.puppycrawl.tools.checkstyle.Checker">
+	<module name="io.spring.javaformat.checkstyle.SpringChecks"/>
+	<module name="com.puppycrawl.tools.checkstyle.TreeWalker">
+		<module
+				name="com.puppycrawl.tools.checkstyle.checks.imports.ImportControlCheck">
+			<property name="file"
+					  value="${main.basedir}/src/checkstyle/import-control.xml"/>
+			<property name="path" value="^.*[\\/]src[\\/]main[\\/].*$"/>
+		</module>
+		<module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
+			<property name="maximum" value="0"/>
+			<property name="format"
+					  value="org\.mockito\.Mockito\.(when|doThrow|doAnswer)"/>
+			<property name="message"
+					  value="Please use BDDMockito imports."/>
+			<property name="ignoreComments" value="true"/>
+		</module>
+	</module>
+</module>
diff --git a/src/checkstyle/import-control.xml b/src/checkstyle/import-control.xml
new file mode 100644
index 00000000..01666ca0
--- /dev/null
+++ b/src/checkstyle/import-control.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE import-control PUBLIC "-//Puppy Crawl//DTD Import Control 1.1//EN"
+		"http://www.puppycrawl.com/dtds/import_control_1_1.dtd">
+<import-control pkg="io.spring.initializr">
+	<allow pkg=".*" regex="true"/>
+	<subpackage name="web">
+		<disallow pkg="io.spring.initializr.generator.spring"/>
+	</subpackage>
+	<subpackage name="actuate">
+		<disallow pkg="io.spring.initializr.generator.spring"/>
+	</subpackage>
+</import-control>