Skip to content

Commit 1fda875

Browse files
committed
config: update checkstyle config to adjust to eclipse-cs style and first commit that use it
1 parent 28a73c7 commit 1fda875

File tree

2 files changed

+28
-7
lines changed

2 files changed

+28
-7
lines changed

config/checkstyle_checks.xml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,7 @@
276276
<property name="tokens" value="LAMBDA"/>
277277
<property name="allowSingleLineStatement" value="true"/>
278278
</module>
279+
<!-- modified -->
279280
<module name="RightCurly">
280281
<property name="tokens" value="METHOD_DEF"/>
281282
<property name="tokens" value="CTOR_DEF"/>
@@ -284,17 +285,18 @@
284285
<property name="tokens" value="LITERAL_FOR"/>
285286
<property name="tokens" value="STATIC_INIT"/>
286287
<property name="tokens" value="LITERAL_WHILE"/>
287-
<property name="tokens" value="LITERAL_CATCH"/>
288288
<property name="tokens" value="LITERAL_ELSE"/>
289289
<property name="tokens" value="LITERAL_FINALLY"/>
290290
<property name="tokens" value="LITERAL_IF"/>
291-
<property name="tokens" value="LITERAL_TRY"/>
291+
<property name="tokens" value="LITERAL_CATCH"/>
292292
<property name="tokens" value="ANNOTATION_DEF"/>
293293
<property name="tokens" value="ENUM_DEF"/>
294294
<property name="option" value="alone"/>
295295
</module>
296+
<!-- modified -->
296297
<module name="RightCurly">
297298
<property name="tokens" value="LITERAL_DO"/>
299+
<property name="tokens" value="LITERAL_TRY"/>
298300
<property name="option" value="same"/>
299301
</module>
300302

@@ -487,15 +489,18 @@
487489
<!-- Imports -->
488490
<module name="AvoidStarImport"/>
489491
<module name="AvoidStaticImport"/>
492+
<!-- disable till we sync import order with main project -->
493+
<!--
490494
<module name="CustomImportOrder">
491495
<property name="customImportOrderRules"
492496
value="STATIC###STANDARD_JAVA_PACKAGE###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE"/>
493497
<property name="standardPackageRegExp" value="^java\."/>
494498
<property name="specialImportsRegExp" value="^javax\."/>
495-
<property name="thirdPartyPackageRegExp" value="^org\."/>
499+
<property name="thirdPartyPackageRegExp" value="^(net|org)\."/>
496500
<property name="sortImportsInGroupAlphabetically" value="true"/>
497501
<property name="separateLineBetweenGroups" value="true"/>
498502
</module>
503+
-->
499504
<module name="IllegalImport"/>
500505
<module name="ImportControl">
501506
<property name="id" value="ImportControlMain"/>
@@ -508,7 +513,7 @@
508513
<property name="path" value="^.*[\\/]src[\\/]test[\\/].*$"/>
509514
</module>
510515
<module name="ImportOrder">
511-
<property name="groups" value="/^java\./,javax,org"/>
516+
<property name="groups" value="/^java\./,javax,net,org"/>
512517
<property name="ordered" value="true"/>
513518
<property name="separated" value="true"/>
514519
<property name="option" value="top"/>
@@ -612,11 +617,12 @@
612617
-->
613618
<property name="severity" value="ignore"/>
614619
</module>
620+
<!-- modified to adjut eclipse-cs style -->
615621
<module name="Indentation">
616-
<property name="basicOffset" value="4"/>
622+
<property name="basicOffset" value="2"/>
617623
<property name="braceAdjustment" value="0"/>
618-
<property name="caseIndent" value="4"/>
619-
<property name="throwsIndent" value="8"/>
624+
<property name="caseIndent" value="2"/>
625+
<property name="throwsIndent" value="4"/>
620626
</module>
621627
<module name="OuterTypeFilename"/>
622628
<module name="TodoComment">

config/suppressions.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,19 @@
55
"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
66

77
<suppressions>
8+
<!-- conflict with header -->
9+
<suppress id="commentStartWithSpace"
10+
files=".*"
11+
lines="1,19"/>
12+
<!-- temporal suppression due to leak -->
13+
<suppress checks="JavadocVariable"
14+
files="XmlProfileWriter.java"
15+
/>
16+
<suppress checks="MissingJavadocMethod"
17+
files="XmlProfileWriter.java"
18+
/>
19+
<!-- no need for non library projects -->
20+
<suppress id="JavadocPackage"
21+
files=".*"
22+
/>
823
</suppressions>

0 commit comments

Comments
 (0)