diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml index 6803583..1a086c4 100644 --- a/.baseline/checkstyle/checkstyle.xml +++ b/.baseline/checkstyle/checkstyle.xml @@ -1,15 +1,9 @@ -<?xml version="1.0"?> -<!DOCTYPE module PUBLIC - "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" - "https://checkstyle.org/dtds/configuration_1_3.dtd"> - -<!-- +<?xml version="1.0" encoding="UTF-8" standalone="no"?><!-- Palantir Baseline Checkstyle configuration. Authors: Robert Fink, Brian Worth, Merrick Zoubeiri, and many other contributors. Based in part on http://checkstyle.sourceforge.net/google_style.html Please keep checks alphabetized with one exception: "relaxed" checks are grouped together at the bottom for easier disabling. Check-specific comments reference documents internal to Palantir and can be safely ignored or removed. - --> - + --><!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd"> <module name="Checker"> <property name="charset" value="UTF-8"/> <property name="severity" value="error"/> @@ -191,12 +185,9 @@ <property name="separated" value="true"/> <property name="sortStaticImportsAlphabetically" value="true"/> </module> - <module name="Indentation"> <!-- Java Style Guide: Block indentation: +4 spaces --> - <property name="arrayInitIndent" value="8"/> - <property name="lineWrappingIndentation" value="8"/> - </module> + <module name="InnerAssignment"/> <!-- Java Coding Guidelines: Inner assignments: Not used --> - <module name="LeftCurly"/> <!-- Java Style Guide: Nonempty blocks: K & R style --> + <!-- Java Style Guide: Nonempty blocks: K & R style --> <module name="MemberName"> <!-- Java Style Guide: Non-constant field names --> <property name="format" value="^[a-z][a-zA-Z0-9]+$"/> <message key="name.invalidPattern" value="Member name ''{0}'' must match pattern ''{1}''."/> @@ -237,7 +228,7 @@ <message key="name.invalidPattern" value="Package name ''{0}'' must match pattern ''{1}''."/> </module> <module name="ParameterAssignment"/> <!-- Java Coding Guidelines: Final variables and parameters --> - <module name="ParenPad"/> <!-- Java Style Guide: Horizontal whitespace --> + <!-- Java Style Guide: Horizontal whitespace --> <module name="RedundantImport"/> <!-- Java Style Guide: No unused imports --> <module name="RedundantModifier"/> <!-- Java Coding Guidelines: Avoid redundant modifiers --> <module name="RegexpSinglelineJava"> <!-- Java Coding Guidelines: Use appropriate assertion methods --> @@ -403,16 +394,7 @@ <module name="UpperEll"/> <!-- Java Style Guide: Numeric Literals --> <module name="VisibilityModifier"/> <!-- Java Coding Guidelines: Minimize mutability --> <module name="WhitespaceAfter"/> <!-- Java Style Guide: Horizontal whitespace --> - <module name="WhitespaceAround"> <!-- Java Style Guide: Horizontal whitespace --> - <property name="allowEmptyConstructors" value="true"/> - <property name="allowEmptyMethods" value="true"/> - <property name="allowEmptyTypes" value="true"/> - <property name="allowEmptyLoops" value="true"/> - <property name="allowEmptyLambdas" value="true"/> - <property name="ignoreEnhancedForColon" value="false"/> - <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)"/> - <message key="ws.notPreceded" value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/> - </module> + <!-- Stricter checks begin: delete some or all of the following for faster prototyping, but please restore before pushing to production. --> @@ -461,4 +443,4 @@ <!-- Stricter checks end --> </module> -</module> +</module> \ No newline at end of file diff --git a/build.gradle b/build.gradle index f0faef4..ba8429d 100644 --- a/build.gradle +++ b/build.gradle @@ -5,6 +5,7 @@ buildscript { } dependencies { + classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.28.0' classpath 'com.palantir.jakartapackagealignment:jakarta-package-alignment:0.5.0' classpath 'com.gradle.publish:plugin-publish-plugin:0.21.0' classpath 'com.palantir.baseline:gradle-baseline-java:4.95.0' @@ -15,6 +16,7 @@ buildscript { } allprojects { apply plugin: 'com.palantir.jakarta-package-alignment' + apply plugin: 'com.palantir.java-format' } apply plugin: 'groovy'