From e0526ce6cd6fc3e93b60b15562deeda6977ae9ee Mon Sep 17 00:00:00 2001 From: Patrick Koenig Date: Tue, 2 Aug 2022 16:43:57 -0700 Subject: [PATCH] Comments --- .../palantir/baseline/errorprone/DefaultLocale.java | 11 ++++++----- .../extensions/BaselineErrorProneExtension.java | 1 - 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/baseline-error-prone/src/main/java/com/palantir/baseline/errorprone/DefaultLocale.java b/baseline-error-prone/src/main/java/com/palantir/baseline/errorprone/DefaultLocale.java index 830a6480e..966818425 100644 --- a/baseline-error-prone/src/main/java/com/palantir/baseline/errorprone/DefaultLocale.java +++ b/baseline-error-prone/src/main/java/com/palantir/baseline/errorprone/DefaultLocale.java @@ -22,6 +22,7 @@ import com.google.errorprone.VisitorState; import com.google.errorprone.bugpatterns.BugChecker; import com.google.errorprone.fixes.SuggestedFix; +import com.google.errorprone.fixes.SuggestedFixes; import com.google.errorprone.matchers.Description; import com.google.errorprone.matchers.Matcher; import com.google.errorprone.matchers.method.MethodMatchers; @@ -34,7 +35,7 @@ linkType = BugPattern.LinkType.CUSTOM, summary = "Implicit use of the platform default locale, which can result in differing behaviour between JVM" + " executions.", - severity = SeverityLevel.WARNING) + severity = SeverityLevel.SUGGESTION) public final class DefaultLocale extends BugChecker implements BugChecker.MethodInvocationTreeMatcher { private static final long serialVersionUID = 1L; @@ -47,13 +48,13 @@ public final class DefaultLocale extends BugChecker implements BugChecker.Method @Override public Description matchMethodInvocation(MethodInvocationTree tree, VisitorState state) { if (MATCHER.matches(tree, state)) { + SuggestedFix.Builder fix = SuggestedFix.builder(); return buildDescription(tree) - .addFix(SuggestedFix.builder() - .addImport("java.util.Locale") - .replace( + .addFix(fix.replace( state.getEndPosition(tree.getMethodSelect()), state.getEndPosition(tree), - "(Locale.ROOT)") + String.format( + "(%s.ROOT)", SuggestedFixes.qualifyType(state, fix, "java.util.Locale"))) .build()) .build(); } diff --git a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/extensions/BaselineErrorProneExtension.java b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/extensions/BaselineErrorProneExtension.java index c14d48d27..1e629da33 100644 --- a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/extensions/BaselineErrorProneExtension.java +++ b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/extensions/BaselineErrorProneExtension.java @@ -38,7 +38,6 @@ public class BaselineErrorProneExtension { "CompileTimeConstantViolatesLiskovSubstitution", "ConsistentLoggerName", "ConsistentOverrides", - "DefaultLocale", "DeprecatedGuavaObjects", "ExecutorSubmitRunnableFutureIgnored", "ExtendsErrorOrThrowable",