From d057f4961843c6e4705360855b61f22cbeabe0bb Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Wed, 29 May 2019 16:14:55 -0700
Subject: [PATCH] Restore JUnit assert checkstyle restrictions

Closes gh-16949
---
 src/checkstyle/checkstyle.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml
index cc573179fe35..a47244b99acf 100644
--- a/src/checkstyle/checkstyle.xml
+++ b/src/checkstyle/checkstyle.xml
@@ -19,6 +19,13 @@
 				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\.junit\.Assert\.assert" />
+			<property name="message"
+				value="Please use AssertJ imports." />
+			<property name="ignoreComments" value="true" />
+		</module>
 		<module
 			name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpSinglelineJavaCheck">
 			<property name="maximum" value="0" />