Autofix orElseGet (#690)

palantir · Jul 12, 2019 · 90c5974 · 90c5974
1 parent 617b857
commit 90c5974
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/changelog/@unreleased/pr-690.v2.yml b/changelog/@unreleased/pr-690.v2.yml
@@ -0,0 +1,5 @@
+type: fix
+fix:
+  description: Auto-fix OptionalOrElseMethodInvocation using `-PerrorProneApply`.
+  links:
+  - https://github.com/palantir/gradle-baseline/pull/690
diff --git a/...ne-java/src/main/groovy/com/palantir/baseline/extensions/BaselineErrorProneExtension.java b/...ne-java/src/main/groovy/com/palantir/baseline/extensions/BaselineErrorProneExtension.java
@@ -29,6 +29,7 @@ public class BaselineErrorProneExtension {
             "PreferListsPartition",
             "PreferSafeLoggableExceptions",
             "PreferSafeLoggingPreconditions",
+            "OptionalOrElseMethodInvocation",
 
             // Built-in checks
             "ArrayEquals",

diff --git a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineErrorProne.java b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineErrorProne.java
@@ -115,6 +115,7 @@ public void apply(Project project) {
                                         "-XepPatchChecks:refaster:" + refasterRulesFile.get().getAbsolutePath(),
                                         "-XepPatchLocation:IN_PLACE"));
                             } else if (project.hasProperty(PROP_ERROR_PRONE_APPLY)) {
+                                javaCompile.getOptions().setWarnings(false);
                                 // TODO(gatesn): Is there a way to discover error-prone checks?
                                 // Maybe service-load from a ClassLoader configured with annotation processor path?
                                 // https://github.com/google/error-prone/pull/947

diff --git a/...eline-java/src/test/groovy/com/palantir/baseline/BaselineErrorProneIntegrationTest.groovy b/...eline-java/src/test/groovy/com/palantir/baseline/BaselineErrorProneIntegrationTest.groovy
@@ -44,12 +44,14 @@ class BaselineErrorProneIntegrationTest extends AbstractPluginTest {
 
     def invalidJavaFile = '''
         package test;
+        import java.util.Optional;
         public class Test {
             void test() {
                 int[] a = {1, 2, 3};
                 int[] b = {1, 2, 3};
                 if (a.equals(b)) {
                   System.out.println("arrays are equal!");
+                  Optional.of("hello").orElse(System.getProperty("world"));
                 }
             }
         }
@@ -112,14 +114,15 @@ class BaselineErrorProneIntegrationTest extends AbstractPluginTest {
         result.task(":compileJava").outcome == TaskOutcome.SUCCESS
         file('src/main/java/test/Test.java').text == '''
         package test;
-        
         import java.util.Arrays;
+        import java.util.Optional;
         public class Test {
             void test() {
                 int[] a = {1, 2, 3};
                 int[] b = {1, 2, 3};
                 if (Arrays.equals(a, b)) {
                   System.out.println("arrays are equal!");
+                  Optional.of("hello").orElseGet(() -> System.getProperty("world"));
                 }
             }
         }