replaced some guava usages with plain java code

mplushnikov · Nov 2, 2015 · 66e7bf3 · 66e7bf3
1 parent c66019e
commit 66e7bf3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/lombok-plugin/src/main/java/de/plushnikov/intellij/plugin/handler/OnXAnnotationHandler.java b/lombok-plugin/src/main/java/de/plushnikov/intellij/plugin/handler/OnXAnnotationHandler.java
@@ -1,6 +1,5 @@
 package de.plushnikov.intellij.plugin.handler;
 
-import com.google.common.collect.ImmutableList;
 import com.intellij.codeInsight.daemon.impl.HighlightInfo;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiAnnotation;
@@ -9,16 +8,18 @@
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiNameValuePair;
 
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.regex.Pattern;
 
 public class OnXAnnotationHandler {
   private static final Pattern UNDERSCORES = Pattern.compile("__*");
   private static final Pattern CANNOT_RESOLVE_UNDERSCORES_MESSAGE = Pattern.compile("Cannot resolve symbol '__*'");
-  
+
   private static final String ANNOTATION_TYPE_EXPECTED = "Annotation type expected";
   private static final String CANNOT_FIND_METHOD_VALUE_MESSAGE = "Cannot find method 'value'";
-  
-  private static final ImmutableList<String> ONXABLE_ANNOTATIONS = ImmutableList.of(
+
+  private static final Collection<String> ONXABLE_ANNOTATIONS = Arrays.asList(
       "lombok.Getter",
       "lombok.Setter",
       "lombok.experimental.Wither",
@@ -27,7 +28,7 @@ public class OnXAnnotationHandler {
       "lombok.AllArgsConstructor",
       "lombok.EqualsAndHashCode"
   );
-  private static final ImmutableList<String> ONX_PARAMETERS = ImmutableList.of(
+  private static final Collection<String> ONX_PARAMETERS = Arrays.asList(
       "onConstructor",
       "onMethod",
       "onParam"
@@ -38,9 +39,9 @@ public static boolean isOnXParameterAnnotation(HighlightInfo highlightInfo, PsiF
         || CANNOT_RESOLVE_UNDERSCORES_MESSAGE.matcher(StringUtil.notNullize(highlightInfo.getDescription())).matches())) {
       return false;
     }
-    
+
     PsiElement highlightedElement = file.findElementAt(highlightInfo.getStartOffset());
-    
+
     PsiNameValuePair nameValuePair = findContainingNameValuePair(highlightedElement);
     if (nameValuePair == null || !(nameValuePair.getContext() instanceof PsiAnnotationParameterList)) {
       return false;
@@ -50,11 +51,11 @@ public static boolean isOnXParameterAnnotation(HighlightInfo highlightInfo, PsiF
     if (!ONX_PARAMETERS.contains(parameterName)) {
       return false;
     }
-    
+
     PsiElement containingAnnotation = nameValuePair.getContext().getContext();
     return containingAnnotation instanceof PsiAnnotation && ONXABLE_ANNOTATIONS.contains(((PsiAnnotation) containingAnnotation).getQualifiedName());
   }
-  
+
   public static boolean isOnXParameterValue(HighlightInfo highlightInfo, PsiFile file) {
     if (!CANNOT_FIND_METHOD_VALUE_MESSAGE.equals(highlightInfo.getDescription())) {
       return false;
@@ -75,7 +76,7 @@ private static PsiNameValuePair findContainingNameValuePair(PsiElement highlight
     while (!(nameValuePair == null || nameValuePair instanceof PsiNameValuePair)) {
       nameValuePair = nameValuePair.getContext();
     }
-    
+
     return (PsiNameValuePair) nameValuePair;
   }
 }
diff --git a/lombok-plugin/src/test/java/de/plushnikov/lombok/LombokParsingTestCase.java b/lombok-plugin/src/test/java/de/plushnikov/lombok/LombokParsingTestCase.java
@@ -134,7 +134,7 @@ private void compareInitializers(PsiExpression beforeInitializer, PsiExpression
     if (shouldCompareInitializers()) {
       String beforeInitializerText = null == beforeInitializer ? "" : beforeInitializer.getText();
       String afterInitializerText = null == afterInitializer ? "" : afterInitializer.getText();
-      assertEquals(String.format("Initializers are not equals "), afterInitializerText, beforeInitializerText);
+      assertEquals("Initializers are not equals ", afterInitializerText, beforeInitializerText);
     }
   }