adoroszlai commented on code in PR #7836: URL: https://github.com/apache/ozone/pull/7836#discussion_r1948086973
########## hadoop-hdds/dev-support/checkstyle/suppressions-skip-imports.xml: ########## @@ -0,0 +1,27 @@ +<?xml version="1.0"?> +<!-- + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. See accompanying LICENSE file. +--> +<!DOCTYPE suppressions PUBLIC + "-//Checkstyle//DTD SuppressionFilter Configuration 1.1//EN" + "https://checkstyle.org/dtds/suppressions_1_1.dtd";> + +<suppressions> + <suppress checks="JavadocPackage" files="[\\/]src[\\/]test[\\/].*"/> + <suppress checks="JavadocPackage" files="src/main/java/org/apache/hadoop/io/erasurecode/rawcoder"/> + <suppress checks="IllegalImport" files="src/test/java/org/apache/hadoop/fs/contract/.*java"/> + <suppress checks="MissingJavadocType" files="src/test/java/org/apache/hadoop/fs/contract/.*java"/> + <suppress checks="IllegalImport" files="src/test/java/org/apache/hadoop/tools/contract/.*java"/> + <suppress checks="CustomImportOrder" files=".*"/> + <suppress checks="Header" files=".*"/> Review Comment: Please add a comment in `suppressions.xml` mentioning that it is duplicated temporarily in this new file. ########## hadoop-hdds/dev-support/checkstyle/checkstyle.xml: ########## @@ -106,45 +106,46 @@ <module name="StaticVariableName"/> <module name="TypeName"/> - - <!-- Checks for Headers --> - <!-- See http://checkstyle.sf.net/config_header.html --> - <!-- <module name="Header"> --> - <!-- The follow property value demonstrates the ability --> - <!-- to have access to ANT properties. In this case it uses --> - <!-- the ${basedir} property to allow Checkstyle to be run --> - <!-- from any directory within a project. See property --> - <!-- expansion, --> - <!-- http://checkstyle.sf.net/config.html#properties --> - <!-- <property --> - <!-- name="headerFile" --> - <!-- value="${basedir}/java.header"/> --> + <!-- Checks for Headers --> + <!-- See http://checkstyle.sf.net/config_header.html --> + <!-- <module name="Header"> --> + <!-- The follow property value demonstrates the ability to have access to ANT properties. --> + <!-- In this case, it uses the ${basedir} property --> + <!-- to allow Checkstyle to be run from any directory within a project. --> + <!-- See property expansion, http://checkstyle.sf.net/config.html#properties --> + <!-- <property --> + <!-- name="headerFile" --> + <!-- value="${basedir}/java.header"/> --> Review Comment: Please avoid reformatting. This makes it more difficult to see the real changes in the file. Indentation fixes I can ignore by `--ignore-space-change`. ########## hadoop-hdds/dev-support/checkstyle/checkstyle.xml: ########## @@ -106,45 +106,46 @@ <module name="StaticVariableName"/> <module name="TypeName"/> - - <!-- Checks for Headers --> - <!-- See http://checkstyle.sf.net/config_header.html --> - <!-- <module name="Header"> --> - <!-- The follow property value demonstrates the ability --> - <!-- to have access to ANT properties. In this case it uses --> - <!-- the ${basedir} property to allow Checkstyle to be run --> - <!-- from any directory within a project. See property --> - <!-- expansion, --> - <!-- http://checkstyle.sf.net/config.html#properties --> - <!-- <property --> - <!-- name="headerFile" --> - <!-- value="${basedir}/java.header"/> --> + <!-- Checks for Headers --> + <!-- See http://checkstyle.sf.net/config_header.html --> + <!-- <module name="Header"> --> + <!-- The follow property value demonstrates the ability to have access to ANT properties. --> + <!-- In this case, it uses the ${basedir} property --> + <!-- to allow Checkstyle to be run from any directory within a project. --> + <!-- See property expansion, http://checkstyle.sf.net/config.html#properties --> + <!-- <property --> + <!-- name="headerFile" --> + <!-- value="${basedir}/java.header"/> --> <!-- </module> --> <!-- Following interprets the header file as regular expressions. --> - <!-- <module name="RegexpHeader"/> --> - + <!-- <module name="RegexpHeader"/> --> - <!-- Checks for imports --> + <!-- Checks for imports --> <!-- See http://checkstyle.sf.net/config_import.html --> <module name="IllegalImport"> - <property name="regexp" value="true"/> - <property name="illegalPkgs" value="^sun\..*, ^.*\.relocated\..*, ^.*\.shaded\..*"/> - <property name="illegalClasses" value="^org.apache.hadoop.test.(GenericTestUtils|LambdaTestUtils|TimedOutTestsListener)"/> + <property name="regexp" value="true"/> + <property name="illegalPkgs" value="^sun\..*, ^.*\.relocated\..*, ^.*\.shaded\..*"/> + <property name="illegalClasses" + value="^org.apache.hadoop.test.(GenericTestUtils|LambdaTestUtils|TimedOutTestsListener)"/> </module> <module name="RedundantImport"/> <module name="UnusedImports"/> - <module name="AvoidStarImport"/> - + <module name="AvoidStarImport"/> + <module name="CustomImportOrder"> + <property name="sortImportsInGroupAlphabetically" value="true"/> + <property name="separateLineBetweenGroups" value="true"/> + <property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/> + <property name="tokens" value="IMPORT, STATIC_IMPORT, PACKAGE_DEF"/> + </module> Review Comment: Can you please include an example in the PR description for the order of imports enforced? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
