Suggestions

PicnicSupermarket · Apr 10, 2022 · 0e42b2c · 0e42b2c
1 parent c2b3db7
commit 0e42b2c
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 39 deletions.
diff --git a/...ontrib/src/main/java/tech/picnic/errorprone/refastertemplates/AssertJNumberTemplates.java b/...ontrib/src/main/java/tech/picnic/errorprone/refastertemplates/AssertJNumberTemplates.java
@@ -1,8 +1,8 @@
 package tech.picnic.errorprone.refastertemplates;
 
+import static com.google.errorprone.refaster.ImportPolicy.STATIC_IMPORT_ALWAYS;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.google.errorprone.refaster.ImportPolicy;
 import com.google.errorprone.refaster.Refaster;
 import com.google.errorprone.refaster.annotation.AfterTemplate;
 import com.google.errorprone.refaster.annotation.BeforeTemplate;
@@ -227,11 +227,6 @@ AbstractBigDecimalAssert<?> before(AbstractBigDecimalAssert<?> numberAssert) {
   }
 
   static final class AssertThatIsOdd {
-    @BeforeTemplate
-    AbstractIntegerAssert<?> before(byte number) {
-      return assertThat(number % 2).isEqualTo(1);
-    }
-
     @BeforeTemplate
     AbstractIntegerAssert<?> before(int number) {
       return assertThat(number % 2).isEqualTo(1);
@@ -242,24 +237,14 @@ AbstractLongAssert<?> before(long number) {
       return assertThat(number % 2).isEqualTo(1);
     }
 
-    @BeforeTemplate
-    AbstractIntegerAssert<?> before(short number) {
-      return assertThat(number % 2).isEqualTo(1);
-    }
-
     @AfterTemplate
-    @UseImportPolicy(ImportPolicy.STATIC_IMPORT_ALWAYS)
-    NumberAssert<?, ?> after(Integer number) {
+    @UseImportPolicy(STATIC_IMPORT_ALWAYS)
+    NumberAssert<?, ?> after(long number) {
       return assertThat(number).isOdd();
     }
   }
 
   static final class AssertThatIsEven {
-    @BeforeTemplate
-    AbstractIntegerAssert<?> before(byte number) {
-      return assertThat(number % 2).isEqualTo(0);
-    }
-
     @BeforeTemplate
     AbstractIntegerAssert<?> before(int number) {
       return assertThat(number % 2).isEqualTo(0);
@@ -270,14 +255,9 @@ AbstractLongAssert<?> before(long number) {
       return assertThat(number % 2).isEqualTo(0);
     }
 
-    @BeforeTemplate
-    AbstractIntegerAssert<?> before(short number) {
-      return assertThat(number % 2).isEqualTo(0);
-    }
-
     @AfterTemplate
-    @UseImportPolicy(ImportPolicy.STATIC_IMPORT_ALWAYS)
-    NumberAssert<?, ?> after(Integer number) {
+    @UseImportPolicy(STATIC_IMPORT_ALWAYS)
+    NumberAssert<?, ?> after(long number) {
       return assertThat(number).isEven();
     }
   }

diff --git a/...ontrib/src/main/java/tech/picnic/errorprone/refastertemplates/AssertJStringTemplates.java b/...ontrib/src/main/java/tech/picnic/errorprone/refastertemplates/AssertJStringTemplates.java
@@ -1,5 +1,6 @@
 package tech.picnic.errorprone.refastertemplates;
 
+import static com.google.errorprone.refaster.ImportPolicy.STATIC_IMPORT_ALWAYS;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.google.errorprone.refaster.ImportPolicy;
@@ -69,7 +70,7 @@ static final class AssertThatMatches {
     }
 
     @AfterTemplate
-    @UseImportPolicy(ImportPolicy.STATIC_IMPORT_ALWAYS)
+    @UseImportPolicy(STATIC_IMPORT_ALWAYS)
     AbstractAssert<?, ?> after(String string, String regex) {
       return assertThat(string).matches(regex);
     }
@@ -82,7 +83,7 @@ static final class AssertThatDoesNotMatch {
     }
 
     @AfterTemplate
-    @UseImportPolicy(ImportPolicy.STATIC_IMPORT_ALWAYS)
+    @UseImportPolicy(STATIC_IMPORT_ALWAYS)
     AbstractAssert<?, ?> after(String string, String regex) {
       return assertThat(string).doesNotMatch(regex);
     }

diff --git a/...rc/test/resources/tech/picnic/errorprone/bugpatterns/AssertJNumberTemplatesTestInput.java b/...rc/test/resources/tech/picnic/errorprone/bugpatterns/AssertJNumberTemplatesTestInput.java
@@ -80,10 +80,10 @@ final class AssertJNumberTemplatesTest implements RefasterTemplateTestCase {
     return ImmutableSet.of(
         assertThat((byte) 1 % 2).isEqualTo(1),
         assertThat(Byte.valueOf((byte) 1) % 2).isEqualTo(1),
-        assertThat((int) 1 % 2).isEqualTo(1),
+        assertThat(1 % 2).isEqualTo(1),
         assertThat(Integer.valueOf(1) % 2).isEqualTo(1),
-        assertThat((long) 1 % 2).isEqualTo(1),
-        assertThat(Long.valueOf(1L) % 2).isEqualTo(1),
+        assertThat(1L % 2).isEqualTo(1),
+        assertThat(Long.valueOf(1) % 2).isEqualTo(1),
         assertThat((short) 1 % 2).isEqualTo(1),
         assertThat(Short.valueOf((short) 1) % 2).isEqualTo(1));
   }
@@ -92,10 +92,10 @@ final class AssertJNumberTemplatesTest implements RefasterTemplateTestCase {
     return ImmutableSet.of(
         assertThat((byte) 1 % 2).isEqualTo(0),
         assertThat(Byte.valueOf((byte) 1) % 2).isEqualTo(0),
-        assertThat((int) 1 % 2).isEqualTo(0),
+        assertThat(1 % 2).isEqualTo(0),
         assertThat(Integer.valueOf(1) % 2).isEqualTo(0),
-        assertThat((long) 1 % 2).isEqualTo(0),
-        assertThat(Long.valueOf(1L) % 2).isEqualTo(0),
+        assertThat(1L % 2).isEqualTo(0),
+        assertThat(Long.valueOf(1) % 2).isEqualTo(0),
         assertThat((short) 1 % 2).isEqualTo(0),
         assertThat(Short.valueOf((short) 1) % 2).isEqualTo(0));
   }

diff --git a/...c/test/resources/tech/picnic/errorprone/bugpatterns/AssertJNumberTemplatesTestOutput.java b/...c/test/resources/tech/picnic/errorprone/bugpatterns/AssertJNumberTemplatesTestOutput.java
@@ -80,10 +80,10 @@ final class AssertJNumberTemplatesTest implements RefasterTemplateTestCase {
     return ImmutableSet.of(
         assertThat((byte) 1).isOdd(),
         assertThat(Byte.valueOf((byte) 1)).isOdd(),
-        assertThat((int) 1).isOdd(),
+        assertThat(1).isOdd(),
         assertThat(Integer.valueOf(1)).isOdd(),
-        assertThat((long) 1).isOdd(),
-        assertThat(Long.valueOf(1L)).isOdd(),
+        assertThat(1L).isOdd(),
+        assertThat(Long.valueOf(1)).isOdd(),
         assertThat((short) 1).isOdd(),
         assertThat(Short.valueOf((short) 1)).isOdd());
   }
@@ -92,10 +92,10 @@ final class AssertJNumberTemplatesTest implements RefasterTemplateTestCase {
     return ImmutableSet.of(
         assertThat((byte) 1).isEven(),
         assertThat(Byte.valueOf((byte) 1)).isEven(),
-        assertThat((int) 1).isEven(),
+        assertThat(1).isEven(),
         assertThat(Integer.valueOf(1)).isEven(),
-        assertThat((long) 1).isEven(),
-        assertThat(Long.valueOf(1L)).isEven(),
+        assertThat(1L).isEven(),
+        assertThat(Long.valueOf(1)).isEven(),
         assertThat((short) 1).isEven(),
         assertThat(Short.valueOf((short) 1)).isEven());
   }