Rewritten @Cleanup's new null analysis prevention to not use

Lombok.preventNullAnalysis but go with Collections.singletonList(expr).get(0)
instead; while this does create a pointless object, it doesn't cause a clash
when eclipse has lombok 0.10 installed but the project uses 0.9, which doesn't
have preventNullAnalysis. Eventually, once 0.9 is long forgotten, this can be reverted.

2 files changed, 4 insertions, 4 deletions

diff --git a/test/transform/resource/after-ecj/CleanupName.java b/test/transform/resource/after-ecj/CleanupName.java
index 8948e91d..f3f725f2 100644
--- a/test/transform/resource/after-ecj/CleanupName.java
+++ b/test/transform/resource/after-ecj/CleanupName.java
@@ -10,7 +10,7 @@ class CleanupName {
       }
     finally
       {
-        if ((lombok.Lombok.preventNullAnalysis(o) != null))
+        if ((java.util.Collections.singletonList(o).get(0) != null))
             {
               o.toString();
             }
@@ -24,7 +24,7 @@ class CleanupName {
       }
     finally
       {
-        if ((lombok.Lombok.preventNullAnalysis(o) != null))
+        if ((java.util.Collections.singletonList(o).get(0) != null))
             {
               o.toString();
             }
diff --git a/test/transform/resource/after-ecj/CleanupPlain.java b/test/transform/resource/after-ecj/CleanupPlain.java
index 6eaa4377..a9b9eceb 100644
--- a/test/transform/resource/after-ecj/CleanupPlain.java
+++ b/test/transform/resource/after-ecj/CleanupPlain.java
@@ -18,7 +18,7 @@ class CleanupPlain {
           }
         finally
           {
-            if ((lombok.Lombok.preventNullAnalysis(out) != null))
+            if ((java.util.Collections.singletonList(out).get(0) != null))
                 {
                   out.close();
                 }
@@ -26,7 +26,7 @@ class CleanupPlain {
       }
     finally
       {
-        if ((lombok.Lombok.preventNullAnalysis(in) != null))
+        if ((java.util.Collections.singletonList(in).get(0) != null))
             {
               in.close();
             }