revert checkstyle module RegexpMultiline because it prevents the test execution TestHiveIcebergRestrictDataFiles.testRestrictDataFiles

Author: kasakrisz

iceberg/checkstyle/checkstyle.xml

@@ -36,13 +36,6 @@
         <property name="header" value="^/\*$\n^ \* Licensed to the Apache Software Foundation \(ASF\) under one$"/>
         <property name="fileExtensions" value=".java,.ts"/>
     </module>
-    <module name="RegexpMultiline">
-        <property name="id" value="AssertThatThrownByWithMessageCheck"/>
-        <property name="fileExtensions" value="java"/>
-        <property name="matchAcrossLines" value="true"/>
-        <property name="format" value="assertThatThrownBy\((?:(?!\.hasMessage\w*\().)*?isInstanceOf\((?:(?!\.hasMessage\w*\().)*?;"/>
-        <property name="message" value="assertThatThrownBy must include a message check like .hasMessage(...)"/>
-    </module>
     <module name="RegexpMultiline">
         <property name="id" value="AssertThatExceptionOfTypeWithMessageCheck"/>
         <property name="fileExtensions" value="java"/>

iceberg/iceberg-catalog/src/test/java/org/apache/iceberg/AssertHelpers.java

@@ -41,8 +41,8 @@ public static void assertThrows(String message,
                                   String containedInMessage,
                                   Callable callable) {
     AbstractThrowableAssert<?, ? extends Throwable> check = Assertions.assertThatThrownBy(callable::call)
-        .isInstanceOf(expected)
-        .hasMessage(message);
+        .withFailMessage(message)
+        .isInstanceOf(expected);
     if (null != containedInMessage) {
       check.hasMessageContaining(containedInMessage);
     }
@@ -61,8 +61,8 @@ public static void assertThrows(String message,
                                   String containedInMessage,
                                   Runnable runnable) {
     AbstractThrowableAssert<?, ? extends Throwable> check = Assertions.assertThatThrownBy(runnable::run)
-        .isInstanceOf(expected)
-        .hasMessage(message);
+        .withFailMessage(message)
+        .isInstanceOf(expected);
     if (null != containedInMessage) {
       check.hasMessageContaining(containedInMessage);
     }