diff options
| author | sebright <sebright@google.com> | 2018-08-01 16:34:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-01 16:34:05 -0700 |
| commit | 8939d9fd639a8a7ff8b25e1a7e6c44d8b2e987db (patch) | |
| tree | c790ca2ddce4531a8e375d176e0d3a05c39f8a69 /buildscripts | |
| parent | 41ee36f606f23146851fd54d37040376930eea2a (diff) | |
| download | opencensus-java-8939d9fd639a8a7ff8b25e1a7e6c44d8b2e987db.tar.gz | |
Fix incorrect argument to Checker Framework, and fix nullness warnings. (#1354)
709d97aa321d5729988fd63b960bbece04cfba10 modified the -AskipDefs argument to the
Checker Framework (a regular expression) in a way that caused it to skip
checking all files. This commit fixes the regular expression and the new
Checker Framework warnings.
Diffstat (limited to 'buildscripts')
| -rw-r--r-- | buildscripts/checkstyle.xml | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/buildscripts/checkstyle.xml b/buildscripts/checkstyle.xml index b136c208..bfdc314f 100644 --- a/buildscripts/checkstyle.xml +++ b/buildscripts/checkstyle.xml @@ -157,14 +157,15 @@ <message key="ws.notPreceded" value="GenericWhitespace ''{0}'' is not preceded with whitespace."/> </module> - <module name="Indentation"> - <property name="basicOffset" value="2"/> - <property name="braceAdjustment" value="0"/> - <property name="caseIndent" value="2"/> - <property name="throwsIndent" value="4"/> - <property name="lineWrappingIndentation" value="4"/> - <property name="arrayInitIndent" value="2"/> - </module> + <!-- <!-\- Checkstyle indentation rules conflict with google-java-format: -\-> --> + <!-- <module name="Indentation"> --> + <!-- <property name="basicOffset" value="2"/> --> + <!-- <property name="braceAdjustment" value="0"/> --> + <!-- <property name="caseIndent" value="2"/> --> + <!-- <property name="throwsIndent" value="4"/> --> + <!-- <property name="lineWrappingIndentation" value="4"/> --> + <!-- <property name="arrayInitIndent" value="2"/> --> + <!-- </module> --> <module name="AbbreviationAsWordInName"> <property name="ignoreFinal" value="false"/> <property name="allowedAbbreviationLength" value="1"/> |