From 7399618c458ee02ab50939a8fd2dc18cd2d8b77f Mon Sep 17 00:00:00 2001
From: Jeff Yemin <jeff.yemin@mongodb.com>
Date: Thu, 11 Nov 2021 12:01:14 -0500
Subject: [PATCH] Revert "Build: Updated configs"

This reverts commit cc061eef07bc54c5bd4b64b0be424c870b76d87a.
---
 build.gradle                                  | 12 +++---
 ...uppressions.xml => checkstyle-exclude.xml} | 10 +----
 config/{checkstyle => }/checkstyle.xml        | 38 ++++++++++---------
 .../exclude.xml => findbugs-exclude.xml}      | 20 ----------
 config/{scala => }/scalafmt.conf              |  0
 5 files changed, 29 insertions(+), 51 deletions(-)
 rename config/{checkstyle/suppressions.xml => checkstyle-exclude.xml} (95%)
 rename config/{checkstyle => }/checkstyle.xml (91%)
 rename config/{spotbugs/exclude.xml => findbugs-exclude.xml} (91%)
 rename config/{scala => }/scalafmt.conf (100%)

diff --git a/build.gradle b/build.gradle
index 19f7ab544c..d4bb39c8fb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,7 +25,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:3.0.3'
-        classpath "com.github.spotbugs.snom:spotbugs-gradle-plugin:4.7.9"
+        classpath "gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.5.0"
         classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:5.1.2'
 
         // Scala plugins
@@ -151,7 +151,7 @@ configure(scalaProjects) {
 
     spotless {
         scala {
-            scalafmt('2.0.0').configFile("$configDir/scala/scalafmt.conf")
+            scalafmt('2.0.0').configFile("$configDir/scalafmt.conf")
         }
     }
     compileScala.dependsOn('spotlessApply')
@@ -253,7 +253,7 @@ configure(javaCodeCheckedProjects) {
         testImplementation('org.junit.jupiter:junit-jupiter-params')
         testImplementation('org.junit.vintage:junit-vintage-engine')
 
-        testImplementation platform('org.spockframework:spock-bom:2.0-groovy-3.0')
+        testImplementation platform('org.spockframework:spock-bom:2.0-groovy-2.5')
         testImplementation 'org.spockframework:spock-core'
         testImplementation 'org.spockframework:spock-junit4'
         testImplementation("org.mockito:mockito-core:3.8.0")
@@ -328,11 +328,13 @@ configure(javaCodeCheckedProjects) {
     }
 
     checkstyle {
-        toolVersion = "9.1"
+        toolVersion = "7.4"
+        configFile = new File(configDir, 'checkstyle.xml')
+        configProperties.checkstyleConfigDir = configDir
     }
 
     spotbugs {
-        excludeFilter = new File(configDir, 'spotbugs/exclude.xml')
+        excludeFilter = new File(configDir, 'findbugs-exclude.xml')
     }
 
     codenarc {
diff --git a/config/checkstyle/suppressions.xml b/config/checkstyle-exclude.xml
similarity index 95%
rename from config/checkstyle/suppressions.xml
rename to config/checkstyle-exclude.xml
index 5b2ea66504..334ba38cfe 100644
--- a/config/checkstyle/suppressions.xml
+++ b/config/checkstyle-exclude.xml
@@ -19,12 +19,10 @@
 <!DOCTYPE suppressions PUBLIC
         "-//Puppy Crawl//DTD Suppressions 1.1//EN"
         "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+
 <suppressions>
-    <!-- vendored code -->
-    <suppress checks="[a-zA-Z0-9]*" files="com[\\/]mongodb[\\/]internal[\\/]connection[\\/]tlschannel[\\/]"/>
 
-    <!-- MongoDriverVersion (generated code) -->
-    <suppress checks="[a-zA-Z0-9]*" files="com[\\/]mongodb[\\/]internal[\\/]build[\\/]MongoDriverVersion.java" />
+    <suppress checks="[a-zA-Z0-9]*" files="com[\\/]mongodb[\\/]internal[\\/]connection[\\/]tlschannel[\\/]"/>
 
     <suppress checks="MethodLength" files="QuickTour"/>
     <suppress checks="Regexp" files="Tour"/>
@@ -62,10 +60,6 @@
     <!--Do not check test classes -->
     <suppress checks="Javadoc*" files=".*test.*"/>
 
-    <!--Do not check tour / helpers classes -->
-    <suppress checks="Javadoc*" files=".*tour.*"/>
-    <suppress checks="Javadoc*" files=".*helpers.*"/>
-
     <!--Do not check The GridFSTour -->
     <suppress checks="Regexp" files="GridFSTour"/>
     <suppress checks="MethodLength" files="GridFSTour"/>
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle.xml
similarity index 91%
rename from config/checkstyle/checkstyle.xml
rename to config/checkstyle.xml
index 158ccbbbb9..b0328f639f 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle.xml
@@ -78,13 +78,6 @@
     <!--   <property name="fileExtensions" value="java"/> -->
     <!-- </module> -->
 
-    <!-- Checks for Size Violations.                    -->
-    <!-- See http://checkstyle.sf.net/config_sizes.html -->
-    <module name="LineLength">
-        <property name="max" value="140"/>
-        <property name="ignorePattern" value="^.*[(http://|https://)|{@see|{@link].*$"/>
-    </module>
-
     <module name="TreeWalker">
 
         <!-- Checks for Javadoc comments.                     -->
@@ -92,13 +85,14 @@
         <module name="JavadocType">
             <property name="scope" value="public"/>
         </module>
-        <module name="JavadocStyle">
+        <module name="JavadocMethod">
             <property name="scope" value="public"/>
-            <property name="checkFirstSentence" value="false"/>
+            <property name="allowUndeclaredRTE" value="true"/>
         </module>
         <!--<module name="JavadocVariable"/>-->
         <!--<module name="JavadocStyle"/>-->
 
+
         <!-- Checks for Naming Conventions.                  -->
         <!-- See http://checkstyle.sf.net/config_naming.html -->
         <module name="ConstantName"/>
@@ -120,6 +114,14 @@
         <module name="RedundantImport"/>
         <module name="UnusedImports"/>
 
+
+        <!-- Checks for Size Violations.                    -->
+        <!-- See http://checkstyle.sf.net/config_sizes.html -->
+        <module name="LineLength">
+            <property name="max" value="140"/>
+            <property name="ignorePattern" value="^.*[(http://|https://)|{@see|{@link].*$"/>
+        </module>
+
         <module name="MethodLength"/>
         <module name="ParameterNumber">
             <property name="max" value="12"/>
@@ -197,6 +199,8 @@
         <!--<module name="TodoComment"/>-->
         <module name="UpperEll"/>
 
+        <module name="FileContentsHolder"/>
+
         <!--System.out.println not allowed-->
         <module name="Regexp">
             <property name="format" value="System\.out\.println"/>
@@ -217,18 +221,16 @@
             <property name="illegalPattern" value="true"/>
             <property name="ignoreComments" value="true"/>
         </module>
-
-        <module name="SuppressionCommentFilter"/>
-        <module name="SuppressionCommentFilter">
-            <property name="offCommentFormat" value="CHECKSTYLE.OFF\: ([\w\|]+)"/>
-            <property name="onCommentFormat" value="CHECKSTYLE.ON\: ([\w\|]+)"/>
-            <property name="checkFormat" value="$1"/>
-        </module>
-
+    </module>
+    <module name="SuppressionCommentFilter"/>
+    <module name="SuppressionCommentFilter">
+        <property name="offCommentFormat" value="CHECKSTYLE.OFF\: ([\w\|]+)"/>
+        <property name="onCommentFormat" value="CHECKSTYLE.ON\: ([\w\|]+)"/>
+        <property name="checkFormat" value="$1"/>
     </module>
 
     <module name="SuppressionFilter">
-        <property name="file" value="${config_loc}/suppressions.xml"/>
+        <property name="file" value="${checkstyleConfigDir}/checkstyle-exclude.xml"/>
     </module>
 
 </module>
diff --git a/config/spotbugs/exclude.xml b/config/findbugs-exclude.xml
similarity index 91%
rename from config/spotbugs/exclude.xml
rename to config/findbugs-exclude.xml
index fa442f752f..3c0b792e29 100644
--- a/config/spotbugs/exclude.xml
+++ b/config/findbugs-exclude.xml
@@ -23,26 +23,6 @@
         <Bug code="EI,EI2"/>
     </Match>
 
-    <Match>
-        <Class name="org.bson.types.ObjectId"/>
-        <Bug pattern="DMI_RANDOM_USED_ONLY_ONCE"/>
-    </Match>
-
-    <Match>
-        <Class name="com.mongodb.internal.connection.AwsAuthenticator$AwsSaslClient"/>
-        <Bug pattern="DMI_RANDOM_USED_ONLY_ONCE"/>
-    </Match>
-
-    <Match>
-        <Class name="com.mongodb.internal.connection.ScramShaAuthenticator$DefaultRandomStringGenerator"/>
-        <Bug pattern="DMI_RANDOM_USED_ONLY_ONCE"/>
-    </Match>
-
-    <Match>
-        <Class name="org.bson.codecs.BsonValueCodecProvider"/>
-        <Method name="getBsonTypeClassMap"/>
-        <Bug pattern="MS_EXPOSE_REP"/>
-    </Match>
 
     <!-- these specific issues are deliberate design decisions -->
 
diff --git a/config/scala/scalafmt.conf b/config/scalafmt.conf
similarity index 100%
rename from config/scala/scalafmt.conf
rename to config/scalafmt.conf