Really fixed AssertThatGuavaOptional inspections to avoid conversions from .get() to .contains() for array types.

README.md

@@ -564,6 +564,10 @@ Feel free to use the code (in package ```de.platon42.intellij.jupiter```) for yo
 
 ## Changelog
 
+#### V1.6 (unreleased)
+- Really fixed AssertThatGuavaOptional inspections to avoid conversions from ```.get()``` to ```.contains()```
+  for array types. Sigh. Shouldn't be working >12h a day and then do some more stuff at home.
+
 #### V1.5 (24-Sep-19)
 - Fix for AssertThatCollectionOrMap inspection sometimes causing an index out of bounds exception.
 - AssertThatGuavaOptional inspections will now avoid conversions from ```.get()``` to ```.contains()```

build.gradle

@@ -7,7 +7,7 @@ plugins {
 }
 
 group 'de.platon42'
-version '1.5'
+version '1.6'
 
 repositories {
     mavenCentral()
@@ -43,16 +43,10 @@ intellij {
 
 patchPluginXml {
     changeNotes """
-  <h4>V1.5 (24-Sep-19)</h4>
+  <h4>V1.6 (unreleased)</h4>
     <ul>
-      <li>Fix for AssertThatCollectionOrMap inspection sometimes causing an index out of bounds exception.
-      <li>AssertThatGuavaOptional inspections will now avoid conversions from .get() to .contains()
-          for array types (currently not correctly supported by AssertJ-Guava).
-      <li>Added an settings option for AssertThatCollectionOrMap inspection respecting the degenerated case of maps with null values.
-          It is now possible to change the behavior for map.get(key) == null, so it can offer either .doesNotContainKey() (default)
-          or .containsEntry(key, null), or even both.
-      <li>Fixes to AssertThatSize inspection after extending it for Maps in previous release as not all
-          combinations for .hasSameSizeAs() are supported.
+      <li>Really fixed AssertThatGuavaOptional inspections to avoid conversions from .get() to .contains()
+          for array types. Sigh. Shouldn't be working &gt;12h a day and then do some more stuff at home.
     </ul>
   <p>Full changelog available at <a href="https://github.com/chrisly42/cajon-plugin#changelog">Github project site</a>.</p>
 """

src/main/java/de/platon42/intellij/plugins/cajon/inspections/AssertThatCollectionOrMapExpressionInspection.kt

@@ -108,7 +108,7 @@ class AssertThatCollectionOrMapExpressionInspection : AbstractAssertJInspection(
                                     expectedCallExpression,
                                     assertThatArgument,
                                     MethodNames.DOES_NOT_CONTAIN_KEY + "/" + MethodNames.CONTAINS_ENTRY
-                                ) { desc ->
+                                ) { _ ->
                                     listOf(
                                         MoveOutMethodCallExpressionQuickFix(
                                             "Remove get() of actual expression and use assertThat().doesNotContainKey() instead (regular map)",

src/main/java/de/platon42/intellij/plugins/cajon/inspections/AssertThatGuavaOptionalInspection.kt

@@ -29,7 +29,7 @@ class AssertThatGuavaOptionalInspection : AbstractAssertJInspection() {
                 val actualExpression = staticMethodCall.firstArg as? PsiMethodCallExpression ?: return
                 val outmostMethodCall = statement.findOutmostMethodCall() ?: return
                 if (GUAVA_OPTIONAL_GET.test(actualExpression)) {
-                    if (actualExpression.resolveMethod()?.returnType is PsiArrayType) return
+                    if (actualExpression.type is PsiArrayType) return
                     val expectedCallExpression = staticMethodCall.gatherAssertionCalls().singleOrNull() ?: return
                     if (CallMatcher.anyOf(IS_EQUAL_TO_OBJECT, IS_EQUAL_TO_STRING).test(expectedCallExpression)) {
                         registerMoveOutMethod(holder, outmostMethodCall, actualExpression, MethodNames.CONTAINS) { desc, method ->

src/test/resources/inspections/GuavaOptional/GuavaOptionalAfter.java

@@ -73,6 +73,8 @@ public class GuavaOptional {
 
         assertThat(opt.orNull()).as("foo").isEqualTo(null).isNotNull();
 
+        assertThat(Optional.of(new byte[] { 2, 3 }).get()).isEqualTo(new byte[] { 2, 3 }); // not working with assertj-guava 3.2.1
+
         org.junit.Assert.assertThat(opt, null);
         fail("oh no!");
     }

src/test/resources/inspections/GuavaOptional/GuavaOptionalBefore.java

@@ -73,6 +73,8 @@ public class GuavaOptional {
 
         assertThat(opt.orNull()).as("foo").isEqualTo(null).isNotNull();
 
+        assertThat(Optional.of(new byte[] { 2, 3 }).get()).isEqualTo(new byte[] { 2, 3 }); // not working with assertj-guava 3.2.1
+
         org.junit.Assert.assertThat(opt, null);
         fail("oh no!");
     }