Skip to content

Commit 363602e

Browse files
committed
fixup: apply changes
Signed-off-by: Simon Schrottner <[email protected]>
1 parent a658e68 commit 363602e

File tree

114 files changed

+3064
-2184
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+3064
-2184
lines changed

.editorconfig

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
root = true
2+
3+
[*]
4+
charset = utf-8
5+
end_of_line = lf
6+
indent_size = 4
7+
indent_style = space
8+
insert_final_newline = true
9+
tab_width = 4
10+
trim_trailing_whitespace = true
11+
12+
ij_continuation_indent_size = 8
13+
14+
[*.md]
15+
max_line_length = off
16+
trim_trailing_whitespace = false
17+
18+
# Following the rules of the Google Java Style Guide.
19+
# See https://google.github.io/styleguide/javaguide.html
20+
[*.java]
21+
max_line_length = 120
22+
23+
ij_java_do_not_wrap_after_single_annotation_in_parameter = true
24+
ij_java_insert_inner_class_imports = false
25+
ij_java_class_count_to_use_import_on_demand = 999
26+
ij_java_names_count_to_use_import_on_demand = 999
27+
ij_java_packages_to_use_import_on_demand = unset
28+
ij_java_imports_layout = $*,|,*
29+
ij_java_doc_align_param_comments = true
30+
ij_java_doc_align_exception_comments = true
31+
ij_java_doc_add_p_tag_on_empty_lines = false
32+
ij_java_doc_do_not_wrap_if_one_line = true
33+
ij_java_doc_keep_empty_parameter_tag = false
34+
ij_java_doc_keep_empty_throws_tag = false
35+
ij_java_doc_keep_empty_return_tag = false
36+
ij_java_doc_preserve_line_breaks = true
37+
ij_java_doc_indent_on_continuation = true
38+
ij_java_keep_control_statement_in_one_line = false
39+
ij_java_keep_blank_lines_in_code = 1
40+
ij_java_align_multiline_parameters = false
41+
ij_java_align_multiline_resources = false
42+
ij_java_align_multiline_for = true
43+
ij_java_space_before_array_initializer_left_brace = true
44+
ij_java_call_parameters_wrap = normal
45+
ij_java_method_parameters_wrap = normal
46+
ij_java_extends_list_wrap = normal
47+
ij_java_throws_keyword_wrap = normal
48+
ij_java_method_call_chain_wrap = normal
49+
ij_java_binary_operation_wrap = normal
50+
ij_java_binary_operation_sign_on_next_line = true
51+
ij_java_ternary_operation_wrap = normal
52+
ij_java_ternary_operation_signs_on_next_line = true
53+
ij_java_keep_simple_methods_in_one_line = true
54+
ij_java_keep_simple_lambdas_in_one_line = true
55+
ij_java_keep_simple_classes_in_one_line = true
56+
ij_java_for_statement_wrap = normal
57+
ij_java_array_initializer_wrap = normal
58+
ij_java_wrap_comments = true
59+
ij_java_if_brace_force = always
60+
ij_java_do_while_brace_force = always
61+
ij_java_while_brace_force = always
62+
ij_java_for_brace_force = always
63+
ij_java_space_after_closing_angle_bracket_in_type_argument = false
64+
65+
[{*.json,*.json5}]
66+
indent_size = 2
67+
tab_width = 2
68+
ij_smart_tabs = false
69+
70+
[*.yaml]
71+
indent_size = 2
72+
tab_width = 2

checkstyle.xml

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,15 @@
2020

2121
<property name="charset" value="UTF-8"/>
2222

23-
<property name="severity" value="${org.checkstyle.google.severity}" default="warning"/>
23+
<property name="severity" value="error"/>
2424

2525
<property name="fileExtensions" value="java, properties, xml"/>
2626
<!-- Excludes all 'module-info.java' files -->
2727
<!-- See https://checkstyle.org/filefilters/index.html -->
2828
<module name="BeforeExecutionExclusionFileFilter">
2929
<property name="fileNamePattern" value="module\-info\.java$"/>
3030
</module>
31-
32-
<module name="SuppressWarningsFilter"/>
33-
34-
<!-- https://checkstyle.org/filters/suppressionfilter.html -->
31+
<!-- https://checkstyle.org/config_filters.html#SuppressionFilter -->
3532
<module name="SuppressionFilter">
3633
<property name="file" value="${org.checkstyle.google.suppressionfilter.config}"
3734
default="checkstyle-suppressions.xml" />
@@ -58,7 +55,24 @@
5855
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
5956
</module>
6057

58+
<module name="SuppressWarningsFilter" />
59+
6160
<module name="TreeWalker">
61+
<!-- needed for SuppressWarningsFilter -->
62+
<module name="SuppressWarningsHolder" />
63+
64+
<module name="SuppressWarnings">
65+
<property name="id" value="checkstyle:suppresswarnings"/>
66+
</module>
67+
68+
<!-- https://checkstyle.org/config_filters.html#SuppressionXpathFilter -->
69+
<module name="SuppressionXpathFilter">
70+
<property name="file" value="${org.checkstyle.google.suppressionxpathfilter.config}"
71+
default="checkstyle-xpath-suppressions.xml" />
72+
<property name="optional" value="true"/>
73+
</module>
74+
75+
<module name="UnusedImports"/>
6276
<module name="OuterTypeFilename"/>
6377
<module name="IllegalTokenText">
6478
<property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/>
@@ -296,8 +310,9 @@
296310
| //SLIST[not(parent::CASE_GROUP)]/SLIST/RCURLY"/>
297311
</module>
298312
<module name="AbbreviationAsWordInName">
299-
<property name="ignoreFinal" value="false"/>
300-
<property name="allowedAbbreviationLength" value="0"/>
313+
<property name="ignoreFinal" value="true"/>
314+
<property name="allowedAbbreviations" value="API" />
315+
<property name="allowedAbbreviationLength" value="1"/>
301316
<property name="tokens"
302317
value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, ANNOTATION_DEF, ANNOTATION_FIELD_DEF,
303318
PARAMETER_DEF, VARIABLE_DEF, METHOD_DEF, PATTERN_VARIABLE_DEF, RECORD_DEF,
@@ -357,7 +372,6 @@
357372
value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
358373
</module>
359374
<module name="JavadocParagraph">
360-
<property name="allowNewlineParagraph" value="false"/>
361375
</module>
362376
<module name="RequireEmptyLineBeforeBlockTagGroup"/>
363377
<module name="AtclauseOrder">
@@ -373,7 +387,8 @@
373387
<property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF, COMPACT_CTOR_DEF"/>
374388
</module>
375389
<module name="MissingJavadocMethod">
376-
<property name="scope" value="protected"/>
390+
<property name="scope" value="public"/>
391+
<property name="minLineCount" value="2"/>
377392
<property name="allowMissingPropertyJavadoc" value="true"/>
378393
<property name="allowedAnnotations" value="Override, Test"/>
379394
<property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF,

0 commit comments

Comments
 (0)