Skip to content

Commit b82a5df

Browse files
Excavator: Upgrades Baseline to the latest version
1 parent ac90371 commit b82a5df

File tree

4 files changed

+39
-59
lines changed

4 files changed

+39
-59
lines changed

.baseline/checkstyle/checkstyle.xml

Lines changed: 19 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
1-
<?xml version="1.0"?>
2-
<!DOCTYPE module PUBLIC
3-
"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
4-
"https://checkstyle.org/dtds/configuration_1_3.dtd">
5-
6-
<!--
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?><!--
72
Palantir Baseline Checkstyle configuration.
83
Authors: Robert Fink, Brian Worth, Merrick Zoubeiri, and many other contributors. Based in part on http://checkstyle.sourceforge.net/google_style.html
94
Please keep checks alphabetized with one exception: "relaxed" checks are grouped together at the bottom for easier disabling.
105
Check-specific comments reference documents internal to Palantir and can be safely ignored or removed.
11-
-->
12-
6+
--><!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd">
137
<module name="Checker">
148
<property name="charset" value="UTF-8"/>
159
<property name="severity" value="error"/>
@@ -18,15 +12,6 @@
1812
<module name="NewlineAtEndOfFile"> <!-- Java Style Guide: Line ending: LF -->
1913
<property name="lineSeparator" value="lf"/>
2014
</module>
21-
<module name="RegexpHeader">
22-
<property name="header" value="^/\*$\n^ \* \(c\) Copyright \d{4} Palantir Technologies Inc\. All rights reserved\.$"/>
23-
<property name="fileExtensions" value=".java,.ts"/>
24-
</module>
25-
<module name="RegexpMultiline"> <!-- Development Practices: Writing good unit tests -->
26-
<property name="fileExtensions" value="java"/>
27-
<property name="format" value="@VisibleForTesting\s+(protected|public)"/>
28-
<property name="message" value="@VisibleForTesting members should be package-private."/>
29-
</module>
3015
<module name="RegexpSingleline"> <!-- No reference needed as this is evident. -->
3116
<property name="format" value="&lt;&lt;&lt;&lt;&lt;&lt;&lt;"/>
3217
<property name="message" value="Found (&lt;&lt;&lt;&lt;&lt;&lt;&lt;), so it looks like you had a merge conflict that compiles. Please fix it."/>
@@ -56,6 +41,10 @@
5641
<module name="BeforeExecutionExclusionFileFilter">
5742
<property name="fileNamePattern" value="module\-info\.java$"/>
5843
</module>
44+
<module name="LineLength"> <!-- Java Style Guide: No line-wrapping -->
45+
<property name="max" value="120"/>
46+
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
47+
</module>
5948
<module name="TreeWalker">
6049
<module name="SuppressionCommentFilter"/> <!-- baseline-gradle: README.md -->
6150
<module name="SuppressionCommentFilter">
@@ -86,14 +75,7 @@
8675
</module>
8776
<module name="AvoidStarImport"/> <!-- Java Style Guide: No wildcard imports -->
8877
<module name="AvoidStaticImport"> <!-- Java Style Guide: No static imports -->
89-
<property name="excludes" value="
90-
com.google.common.base.Preconditions.*,
91-
com.palantir.logsafe.Preconditions.*,
92-
java.util.Collections.*,
93-
java.util.stream.Collectors.*,
94-
org.apache.commons.lang3.Validate.*,
95-
org.assertj.core.api.Assertions.*,
96-
org.mockito.Mockito.*"/>
78+
<property name="excludes" value="com.google.common.base.Preconditions.*, com.palantir.logsafe.Preconditions.*, java.util.Collections.*, java.util.stream.Collectors.*, org.apache.commons.lang3.Validate.*, org.assertj.core.api.Assertions.*, org.mockito.Mockito.*"/>
9779
</module>
9880
<module name="ClassTypeParameterName"> <!-- Java Style Guide: Type variable names -->
9981
<property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
@@ -143,12 +125,12 @@
143125
<module name="IllegalImport"> <!-- Java Coding Guidelines: Import the canonical package -->
144126
<property name="id" value="BanShadedClasses"/>
145127
<property name="illegalPkgs" value=".*\.(repackaged|shaded|thirdparty)"/>
146-
<property name="regexp" value="true" />
128+
<property name="regexp" value="true"/>
147129
<message key="import.illegal" value="Must not import repackaged classes."/>
148130
</module>
149131
<module name="IllegalImport">
150132
<property name="illegalPkgs" value="^org\.gradle\.(internal|.*\.internal)"/>
151-
<property name="regexp" value="true" />
133+
<property name="regexp" value="true"/>
152134
<message key="import.illegal" value="Do not rely on gradle internal classes as these may change in minor releases - use org.gradle.api versions instead."/>
153135
</module>
154136
<module name="IllegalImport">
@@ -201,12 +183,9 @@
201183
<property name="separated" value="true"/>
202184
<property name="sortStaticImportsAlphabetically" value="true"/>
203185
</module>
186+
204187
<module name="InnerAssignment"/> <!-- Java Coding Guidelines: Inner assignments: Not used -->
205-
<module name="LeftCurly"/> <!-- Java Style Guide: Nonempty blocks: K & R style -->
206-
<module name="LineLength"> <!-- Java Style Guide: No line-wrapping -->
207-
<property name="max" value="120"/>
208-
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
209-
</module>
188+
<!-- Java Style Guide: Nonempty blocks: K & R style -->
210189
<module name="MemberName"> <!-- Java Style Guide: Non-constant field names -->
211190
<property name="format" value="^[a-z][a-zA-Z0-9]+$"/>
212191
<message key="name.invalidPattern" value="Member name ''{0}'' must match pattern ''{1}''."/>
@@ -247,7 +226,7 @@
247226
<message key="name.invalidPattern" value="Package name ''{0}'' must match pattern ''{1}''."/>
248227
</module>
249228
<module name="ParameterAssignment"/> <!-- Java Coding Guidelines: Final variables and parameters -->
250-
<module name="ParenPad"/> <!-- Java Style Guide: Horizontal whitespace -->
229+
<!-- Java Style Guide: Horizontal whitespace -->
251230
<module name="RedundantImport"/> <!-- Java Style Guide: No unused imports -->
252231
<module name="RedundantModifier"/> <!-- Java Coding Guidelines: Avoid redundant modifiers -->
253232
<module name="RegexpSinglelineJava"> <!-- Java Coding Guidelines: Use appropriate assertion methods -->
@@ -363,7 +342,7 @@
363342
</module>
364343
<module name="RegexpSinglelineJava">
365344
<property name="format" value="\bCharset.defaultCharset\("/>
366-
<property name="message" value="Use explicit charset (e.g. StandardCharsets.UTF-8) instead of default."/>
345+
<property name="message" value="Use explicit charset (e.g. StandardCharsets.UTF_8) instead of default."/>
367346
</module>
368347
<module name="RegexpSinglelineJava">
369348
<property name="format" value="\bIOUtils\.toString\("/>
@@ -372,18 +351,19 @@
372351
<module name="RegexpSinglelineJava">
373352
<property name="format" value="\/\/TODO|\/\/ TODO(?!\([^()\s]+\): )"/>
374353
<property name="message" value="TODO format: // TODO(#issue): explanation"/>
354+
<property name="ignoreCase" value="true"/>
375355
</module>
376356
<module name="RegexpSinglelineJava">
377357
<property name="format" value="(void setUp\(\))|(void setup\(\))|(void setupStatic\(\))|(void setUpStatic\(\))|(void beforeTest\(\))|(void teardown\(\))|(void tearDown\(\))|(void beforeStatic\(\))|(void afterStatic\(\))"/>
378358
<property name="message" value="Test setup/teardown methods are called before(), beforeClass(), after(), afterClass(), but not setUp, teardown, etc."/>
379359
</module>
380360
<module name="RightCurly"> <!-- Java Style Guide: Nonempty blocks: K & R style -->
381361
<property name="option" value="same"/>
382-
<property name="tokens" value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_DO"/>
362+
<property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_DO"/>
383363
</module>
384364
<module name="RightCurly"> <!-- Java Style Guide: Nonempty blocks: K & R style -->
385365
<property name="option" value="alone"/>
386-
<property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT, INSTANCE_INIT"/>
366+
<property name="tokens" value="LITERAL_FOR, LITERAL_WHILE, STATIC_INIT, INSTANCE_INIT"/>
387367
</module>
388368
<module name="SeparatorWrap"> <!-- Java Style Guide: Where to break -->
389369
<property name="tokens" value="DOT"/>
@@ -401,28 +381,18 @@
401381
<module name="SuppressWarnings">
402382
<property name="format" value="serial"/>
403383
</module>
404-
<module name="SuppressWarningsHolder" /> <!-- Required for SuppressWarningsFilter -->
384+
<module name="SuppressWarningsHolder"/> <!-- Required for SuppressWarningsFilter -->
405385
<module name="TypeName"> <!-- Java Style Guide: Class names -->
406386
<message key="name.invalidPattern" value="Type name ''{0}'' must match pattern ''{1}''."/>
407387
</module>
408388
<module name="TypecastParenPad"/> <!-- Java Style Guide: Horizontal whitespace -->
409-
<module name="UnnecessaryParentheses"/>
410389
<module name="UnusedImports"> <!-- Java Style Guide: No unused imports -->
411390
<property name="processJavadoc" value="true"/>
412391
</module>
413392
<module name="UpperEll"/> <!-- Java Style Guide: Numeric Literals -->
414393
<module name="VisibilityModifier"/> <!-- Java Coding Guidelines: Minimize mutability -->
415394
<module name="WhitespaceAfter"/> <!-- Java Style Guide: Horizontal whitespace -->
416-
<module name="WhitespaceAround"> <!-- Java Style Guide: Horizontal whitespace -->
417-
<property name="allowEmptyConstructors" value="true"/>
418-
<property name="allowEmptyMethods" value="true"/>
419-
<property name="allowEmptyTypes" value="true"/>
420-
<property name="allowEmptyLoops" value="true"/>
421-
<property name="allowEmptyLambdas" value="true"/>
422-
<property name="ignoreEnhancedForColon" value="false"/>
423-
<message key="ws.notFollowed" value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
424-
<message key="ws.notPreceded" value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
425-
</module>
395+
426396

427397
<!-- Stricter checks begin: delete some or all of the following for faster prototyping, but please restore before pushing to production. -->
428398

@@ -437,11 +407,8 @@
437407
<module name="JavadocMethod"> <!-- Java Style Guide: Where Javadoc is used -->
438408
<property name="scope" value="public"/>
439409
<property name="allowMissingParamTags" value="true"/>
440-
<property name="allowMissingThrowsTags" value="true"/>
441410
<property name="allowMissingReturnTag" value="true"/>
442-
<property name="minLineCount" value="99999999"/>
443411
<property name="allowedAnnotations" value="Override, Test"/>
444-
<property name="allowThrowsTagsForSubclasses" value="true"/>
445412
</module>
446413
<module name="JavadocStyle"/> <!-- Java Style Guide: Javadoc -->
447414
<module name="JavadocTagContinuationIndentation"> <!-- Java Style Guide: At-clauses -->
@@ -474,4 +441,4 @@
474441

475442
<!-- Stricter checks end -->
476443
</module>
477-
</module>
444+
</module>

.baseline/eclipse/static/dotfile.settings/org.eclipse.jdt.ui.prefs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ org.eclipse.jdt.ui.ignorelowercasenames=true
88
org.eclipse.jdt.ui.importorder=;
99
org.eclipse.jdt.ui.javadoc=false
1010
org.eclipse.jdt.ui.keywordthis=false
11-
org.eclipse.jdt.ui.ondemandthreshold=99
11+
org.eclipse.jdt.ui.ondemandthreshold=999
1212
org.eclipse.jdt.ui.overrideannotation=true
13-
org.eclipse.jdt.ui.staticondemandthreshold=99
13+
org.eclipse.jdt.ui.staticondemandthreshold=999
1414
org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment"/><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*\n * (c) Copyright ${year} Palantir Technologies Inc. All rights reserved.\n */\n\n${package_declaration}\n\n/**\n * \n */\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">throw new RuntimeException(${exception_var});</template><template autoinsert\="false" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">${body_statement}</template><template autoinsert\="false" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
1515
sp_cleanup.add_default_serial_version_id=true
1616
sp_cleanup.add_generated_serial_version_id=false

.baseline/idea/intellij-java-palantir-style.xml

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<option name="BINARY_OPERATION_WRAP" value="1" />
1717
<option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
1818
<option name="CALL_PARAMETERS_WRAP" value="1" />
19-
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
19+
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
2020
<option name="DOWHILE_BRACE_FORCE" value="3" />
2121
<option name="EXTENDS_KEYWORD_WRAP" value="1" />
2222
<option name="EXTENDS_LIST_WRAP" value="1" />
@@ -30,9 +30,10 @@
3030
<package name="" static="false" withSubpackages="true" />
3131
</value>
3232
</option>
33+
<option name="INSERT_INNER_CLASS_IMPORTS" value="true" />
3334
<GroovyCodeStyleSettings>
34-
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
35-
<option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
35+
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
36+
<option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
3637
<option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
3738
<value />
3839
</option>
@@ -43,6 +44,18 @@
4344
<package name="" withSubpackages="true" static="false" />
4445
</value>
4546
</option>
47+
<DO_NOT_IMPORT_INNER>
48+
<CLASS name="Builder" />
49+
<CLASS name="Callback" />
50+
<CLASS name="Class" />
51+
<CLASS name="Entry" />
52+
<CLASS name="Enum" />
53+
<CLASS name="Factory" />
54+
<CLASS name="Type" />
55+
<CLASS name="Key" />
56+
<CLASS name="Id" />
57+
<CLASS name="Provider" />
58+
</DO_NOT_IMPORT_INNER>
4659
</GroovyCodeStyleSettings>
4760
<option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
4861
<option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
@@ -55,7 +68,7 @@
5568
<option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
5669
<option name="METHOD_CALL_CHAIN_WRAP" value="1" />
5770
<option name="METHOD_PARAMETERS_WRAP" value="1" />
58-
<option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
71+
<option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
5972
<option name="OPTIMIZE_IMPORTS_ON_THE_FLY" value="true" />
6073
<option name="OTHER_INDENT_OPTIONS">
6174
<value>

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ buildscript {
2424
dependencies {
2525
classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.2.1'
2626
classpath 'com.palantir.javaformat:gradle-palantir-java-format:1.0.1'
27-
classpath 'com.palantir.baseline:gradle-baseline-java:2.49.2'
27+
classpath 'com.palantir.baseline:gradle-baseline-java:3.89.0'
2828
classpath 'com.palantir.gradle.conjure:gradle-conjure:5.6.1'
2929
classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.3'
3030
}

0 commit comments

Comments
 (0)