This is an automated email from the ASF dual-hosted git repository.

vjasani pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
     new 861010d5cf PHOENIX-7676 Update checkstyle checker.xml based on 
spotless rules (#2240)
861010d5cf is described below

commit 861010d5cf8d18930a948c7c5dd1cc7be994a975
Author: Nihal Jain <nihalj...@apache.org>
AuthorDate: Mon Jul 21 23:42:35 2025 +0530

    PHOENIX-7676 Update checkstyle checker.xml based on spotless rules (#2240)
---
 src/main/config/checkstyle/checker.xml | 104 +++++++++++++++++----------------
 1 file changed, 53 insertions(+), 51 deletions(-)

diff --git a/src/main/config/checkstyle/checker.xml 
b/src/main/config/checkstyle/checker.xml
index 8e840543ce..51b5997a4d 100644
--- a/src/main/config/checkstyle/checker.xml
+++ b/src/main/config/checkstyle/checker.xml
@@ -36,26 +36,26 @@ limitations under the License.
 
   <!-- Checks for headers -->
   <!-- See http://checkstyle.sf.net/config_header.html -->
-    <!-- Verify that EVERY source file has the appropriate license -->
+  <!-- Verify that EVERY source file has the appropriate license -->
   <module name="Header">
     <property name="headerFile" value="${checkstyle.header.file}"/>
   </module>
 
   <!-- Checks for Javadoc comments (checker).           -->
   <!-- See http://checkstyle.sf.net/config_javadoc.html -->
-    <!-- Require package javadoc -->
+  <!-- Require package javadoc -->
   <module name="JavadocPackage"/>
 
   <!-- Miscellaneous other checks (checker).         -->
   <!-- See http://checkstyle.sf.net/config_misc.html -->
-    <!-- Require files to end with newline characters -->
+  <!-- Require files to end with newline characters -->
   <module name="NewlineAtEndOfFile">
     <property name="lineSeparator" value="lf"/>
   </module>
 
   <!-- Checks for whitespace (tree walker)                 -->
   <!-- See http://checkstyle.sf.net/config_whitespace.html -->
-    <!-- No tabs allowed! -->
+  <!-- No tabs allowed! -->
   <module name="FileTabCharacter"/>
 
   <!-- Checks for Size Violations.                    -->
@@ -71,68 +71,68 @@ limitations under the License.
 
     <!-- Checks for blocks. You know, those {}'s         -->
     <!-- See http://checkstyle.sf.net/config_blocks.html -->
-      <!-- No empty blocks (i.e. catch); must contain at least a comment -->
+    <!-- No empty blocks (i.e. catch); must contain at least a comment -->
     <module name="EmptyBlock">
       <property name="option" value="text"/>
     </module>
     <module name="AvoidNestedBlocks">
-        <property name="allowInSwitchCase" value="true"/>
+      <property name="allowInSwitchCase" value="true"/>
     </module>
     <module name="LeftCurly"/>
-      <!-- No if/else/do/for/while without braces -->
+    <!-- No if/else/do/for/while without braces -->
     <module name="NeedBraces"/>
     <module name="RightCurly"/>
 
     <!-- Checks for class design                         -->
     <!-- See http://checkstyle.sf.net/config_design.html -->
-      <!-- Utility class should not be instantiated, they must have a
-          private constructor -->
+    <!-- Utility class should not be instantiated, they must have a
+     private constructor -->
     <module name="HideUtilityClassConstructor"/>
 
     <!-- Checks for common coding problems               -->
     <!-- See http://checkstyle.sf.net/config_coding.html -->
     <module name="EmptyStatement"/>
-      <!-- Require hash code override when equals is -->
+    <!-- Require hash code override when equals is -->
     <module name="EqualsHashCode"/>
-      <!-- Disallow unnecessary instantiation of Boolean, String -->
+    <!-- Disallow unnecessary instantiation of Boolean, String -->
     <module name="IllegalInstantiation">
       <property name="classes" value="java.lang.Boolean, java.lang.String"/>
     </module>
-      <!-- Switch statements should be complete and with independent cases -->
+    <!-- Switch statements should be complete and with independent cases -->
     <module name="FallThrough"/>
     <module name="SimplifyBooleanExpression"/>
     <module name="SimplifyBooleanReturn"/>
-      <!-- Only one statement per line allowed -->
+    <!-- Only one statement per line allowed -->
     <module name="OneStatementPerLine"/>
-      <!-- Don't add up parentheses when they are not required -->
+    <!-- Don't add up parentheses when they are not required -->
     <module name="UnnecessaryParentheses" />
-      <!-- Don't use = or != for string comparisons -->
+    <!-- Don't use = or != for string comparisons -->
     <module name="StringLiteralEquality" />
-      <!-- Don't declare multiple variables in the same statement -->
+    <!-- Don't declare multiple variables in the same statement -->
     <module name="MultipleVariableDeclarations" />
-      <!-- String literals more than one character long should not be
-          repeated several times -->
-      <!-- the "unchecked" string is also accepted to allow
-          @SuppressWarnings("unchecked") -->
-      <!-- Disabling for now until we have a better ignoreStringsRegexp -->
-      <!--
-    <module name="MultipleStringLiterals" >
-      <property name="ignoreStringsRegexp" 
value='^(("")|(".")|("unchecked"))$'/>
-    </module>
-      -->
+    <!-- String literals more than one character long should not be
+     repeated several times -->
+    <!-- the "unchecked" string is also accepted to allow
+     @SuppressWarnings("unchecked") -->
+    <!-- Disabling for now until we have a better ignoreStringsRegexp -->
+    <!--
+  <module name="MultipleStringLiterals" >
+    <property name="ignoreStringsRegexp" value='^(("")|(".")|("unchecked"))$'/>
+  </module>
+    -->
 
     <!-- Checks for imports                              -->
     <!-- See http://checkstyle.sf.net/config_import.html -->
     <module name="RedundantImport"/>
-      <!-- Import should be explicit, and only from pure java packages.
-           But we allow imports that are only used in javadoc. -->
+    <!-- Import should be explicit, and only from pure java packages.
+         But we allow imports that are only used in javadoc. -->
     <module name="UnusedImports">
       <property name="processJavadoc" value="true"/>
     </module>
     <module name="IllegalImport" />
     <module name="AvoidStarImport" />
     <module name="ImportOrder">
-      <property name="groups" 
value="java,javax,lib,shared,common,platform,org,com,io,net,scala,clover"/>
+      <property name="groups" 
value="*,org.apache.phoenix.thirdparty,org.apache.phoenix.shaded,org.apache.hbase.thirdparty,org.apache.hadoop.hbase.shaded"/>
       <property name="ordered" value="true"/>
       <property name="separated" value="true"/>
       <property name="option" value="bottom"/>
@@ -140,40 +140,42 @@ limitations under the License.
 
     <!-- Checks for Javadoc comments (tree walker).       -->
     <!-- See http://checkstyle.sf.net/config_javadoc.html -->
-      <!-- Javadoc must be formatted correctly -->
+    <!-- Javadoc must be formatted correctly -->
     <module name="JavadocStyle">
       <property name="checkFirstSentence" value="false"/>
     </module>
-      <!-- Must have class / interface header comments -->
+    <!-- Must have class / interface header comments -->
     <module name="JavadocType"/>
 
     <!-- Miscellaneous other checks (tree walker).     -->
     <!-- See http://checkstyle.sf.net/config_misc.html -->
-      <!-- Java style arrays -->
+    <!-- Java style arrays -->
     <module name="ArrayTypeStyle"/>
-      <!-- Indentation -->
+    <!-- Indentation -->
     <module name="Indentation">
-      <property name="caseIndent" value="0"/>
-      <property name="basicOffset" value="4"/>
-      <property name="braceAdjustment" value="0"/>
+      <property name="basicOffset" value="2"/>
+      <property name="caseIndent" value="2"/>
+      <property name="throwsIndent" value="2"/>
+      <property name="arrayInitIndent" value="2"/>
+      <property name="lineWrappingIndentation" value="2"/>
     </module>
-      <!-- Turn this on to see what needs to be done
-    <module name="TodoComment"/>
-       -->
+    <!-- Turn this on to see what needs to be done
+  <module name="TodoComment"/>
+     -->
     <module name="UpperEll"/>
 
     <module name="OperatorWrap"/>
 
     <!-- Modifier Checks                                    -->
     <!-- See http://checkstyle.sf.net/config_modifiers.html -->
-      <!-- Use a consistent way to put modifiers -->
+    <!-- Use a consistent way to put modifiers -->
     <module name="ModifierOrder"/>
     <module name="RedundantModifier"/>
 
     <!-- Checks for Naming Conventions.                  -->
     <!-- See http://checkstyle.sf.net/config_naming.html -->
-      <!-- Constant names should obey the traditional all uppercase
-          naming convention -->
+    <!-- Constant names should obey the traditional all uppercase
+     naming convention -->
     <module name="ConstantName"/>
     <module name="LocalFinalVariableName">
       <!-- Allow '_' except first. -->
@@ -227,7 +229,7 @@ limitations under the License.
       <property name="message" value="C-style comment"/>
     </module>
 
-      <!-- Over time, we will revise this down -->
+    <!-- Over time, we will revise this down -->
     <module name="MethodLength">
       <property name="max" value="390"/>
     </module>
@@ -235,23 +237,23 @@ limitations under the License.
     <!-- Checks for whitespace (tree walker)                 -->
     <!-- See http://checkstyle.sf.net/config_whitespace.html -->
     <module name="EmptyForIteratorPad"/>
-      <!-- Spacing around methods -->
+    <!-- Spacing around methods -->
     <module name="MethodParamPad">
       <property name="option" value="nospace"/>
       <property name="allowLineBreaks" value="true"/>
-     </module>
-      <!-- No whitespace before a token -->
+    </module>
+    <!-- No whitespace before a token -->
     <module name="NoWhitespaceBefore"/>
-      <!-- Whitespace after tokens is required -->
+    <!-- Whitespace after tokens is required -->
     <module name="WhitespaceAfter"/>
-      <!-- Whitespace around tokens is required -->
+    <!-- Whitespace around tokens is required -->
     <module name="WhitespaceAround">
-        <property name="allowEmptyConstructors" value="true"/>
-        <property name="allowEmptyMethods" value="true"/>
+      <property name="allowEmptyConstructors" value="true"/>
+      <property name="allowEmptyMethods" value="true"/>
     </module>
     <module name="ParenPad"/>
     <module name="TypecastParenPad"/>
-      <!-- No extra whitespace around types -->
+    <!-- No extra whitespace around types -->
     <module name="GenericWhitespace"/>
 
     <!-- Setup special comments to suppress specific checks from source files 
-->

Reply via email to