Dropping Guava predicates in favour of java.util.function.Predicate

Author: Federico Fissore

app/src/cc/arduino/contributions/BuiltInCoreIsNewerCheck.java

@@ -35,7 +35,6 @@
 import cc.arduino.contributions.packages.ContributedPlatform;
 import cc.arduino.view.Event;
 import com.google.common.base.Function;
-import com.google.common.base.Predicates;
 import com.google.common.collect.Collections2;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
@@ -48,6 +47,7 @@
 import java.awt.event.ActionEvent;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static processing.app.I18n._;
 
@@ -80,7 +80,7 @@ public List<ContributedPlatform> apply(ContributedPackage input) {
       }
     })));
 
-    List<ContributedPlatform> installedBuiltInPlatforms = new LinkedList<ContributedPlatform>(Collections2.filter(contributedPlatforms, Predicates.and(new InstalledPredicate(), new BuiltInPredicate())));
+    List<ContributedPlatform> installedBuiltInPlatforms = contributedPlatforms.stream().filter(new InstalledPredicate()).filter(new BuiltInPredicate()).collect(Collectors.toList());
     if (installedBuiltInPlatforms.size() != 1) {
       return;
     }

app/src/cc/arduino/contributions/filters/NoopPredicate.java

@@ -29,12 +29,12 @@
 
 package cc.arduino.contributions.filters;
 
-import com.google.common.base.Predicate;
+import java.util.function.Predicate;
 
 public class NoopPredicate<T> implements Predicate<T> {
 
   @Override
-  public boolean apply(T input) {
+  public boolean test(T input) {
     return true;
   }
 

app/src/cc/arduino/contributions/libraries/filters/CategoryPredicate.java

@@ -30,7 +30,8 @@
 package cc.arduino.contributions.libraries.filters;
 
 import cc.arduino.contributions.libraries.ContributedLibrary;
-import com.google.common.base.Predicate;
+
+import java.util.function.Predicate;
 
 public class CategoryPredicate implements Predicate<ContributedLibrary> {
 
@@ -41,7 +42,7 @@ public CategoryPredicate(String category) {
   }
 
   @Override
-  public boolean apply(ContributedLibrary input) {
+  public boolean test(ContributedLibrary input) {
     return input.getCategory() != null && category.equals(input.getCategory());
   }
 

app/src/cc/arduino/contributions/libraries/filters/InstalledLibraryPredicate.java

@@ -32,10 +32,9 @@
 import cc.arduino.contributions.filters.InstalledPredicate;
 import cc.arduino.contributions.libraries.ContributedLibrary;
 import cc.arduino.contributions.libraries.LibrariesIndex;
-import com.google.common.base.Predicate;
-import com.google.common.collect.Collections2;
 
-import java.util.Collection;
+import java.util.List;
+import java.util.function.Predicate;
 
 public class InstalledLibraryPredicate implements Predicate<ContributedLibrary> {
 
@@ -46,14 +45,15 @@ public InstalledLibraryPredicate(LibrariesIndex index) {
   }
 
   @Override
-  public boolean apply(ContributedLibrary input) {
+  public boolean test(ContributedLibrary input) {
     if (input.isInstalled()) {
       return true;
     }
 
-    Collection<ContributedLibrary> installed = Collections2.filter(index.find(input.getName()), new InstalledPredicate());
-
-    return !installed.isEmpty();
+    List<ContributedLibrary> libraries = index.find(input.getName());
+    return libraries.stream()
+      .filter(new InstalledPredicate())
+      .count() > 0;
   }
 
   @Override

app/src/cc/arduino/contributions/libraries/filters/OnlyUpstreamReleasePredicate.java

@@ -30,13 +30,14 @@
 package cc.arduino.contributions.libraries.filters;
 
 import cc.arduino.contributions.libraries.ContributedLibrary;
-import com.google.common.base.Predicate;
 import processing.app.packages.UserLibrary;
 
+import java.util.function.Predicate;
+
 public class OnlyUpstreamReleasePredicate implements Predicate<ContributedLibrary> {
 
   @Override
-  public boolean apply(ContributedLibrary input) {
+  public boolean test(ContributedLibrary input) {
     return !(input instanceof UserLibrary);
   }
 

app/src/cc/arduino/contributions/libraries/filters/UpdatableLibraryPredicate.java

@@ -3,10 +3,10 @@
 import cc.arduino.contributions.VersionComparator;
 import cc.arduino.contributions.libraries.ContributedLibrary;
 import cc.arduino.contributions.libraries.LibrariesIndexer;
-import com.google.common.base.Predicate;
 import processing.app.packages.UserLibrary;
 
 import java.util.List;
+import java.util.function.Predicate;
 
 public class UpdatableLibraryPredicate implements Predicate<ContributedLibrary> {
 
@@ -19,7 +19,7 @@ public UpdatableLibraryPredicate(LibrariesIndexer indexer) {
   }
 
   @Override
-  public boolean apply(ContributedLibrary contributedLibrary) {
+  public boolean test(ContributedLibrary contributedLibrary) {
     String libraryName = contributedLibrary.getName();
     UserLibrary installed = indexer.getInstalledLibraries().getByName(libraryName);
     if (installed == null) {

app/src/cc/arduino/contributions/libraries/ui/ContributedLibraryTableCell.java

@@ -40,8 +40,6 @@
 import cc.arduino.contributions.ui.listeners.DelegatingKeyListener;
 import cc.arduino.utils.ReverseComparator;
 import com.google.common.base.Function;
-import com.google.common.base.Predicates;
-import com.google.common.collect.Collections2;
 import com.google.common.collect.Lists;
 import processing.app.Base;
 
@@ -58,8 +56,8 @@
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static processing.app.I18n._;
 import static processing.app.I18n.format;
@@ -248,10 +246,10 @@ public Component getTableCellEditorComponent(JTable table, Object value,
 
     final ContributedLibrary installed = editorValue.getInstalled();
 
-    List<ContributedLibrary> releases = new LinkedList<ContributedLibrary>(Collections2.filter(editorValue.releases, new OnlyUpstreamReleasePredicate()));
-    List<ContributedLibrary> uninstalledReleases = new LinkedList<ContributedLibrary>(Collections2.filter(releases, Predicates.not(new InstalledPredicate())));
+    List<ContributedLibrary> releases = editorValue.releases.stream().filter(new OnlyUpstreamReleasePredicate()).collect(Collectors.toList());
+    List<ContributedLibrary> uninstalledReleases = releases.stream().filter(new InstalledPredicate().negate()).collect(Collectors.toList());
 
-    List<ContributedLibrary> installedBuiltIn = new LinkedList<ContributedLibrary>(Collections2.filter(releases, Predicates.and(new InstalledPredicate(), new BuiltInPredicate())));
+    List<ContributedLibrary> installedBuiltIn = releases.stream().filter(new InstalledPredicate()).filter(new BuiltInPredicate()).collect(Collectors.toList());
 
     if (installed != null && !installedBuiltIn.contains(installed)) {
       uninstalledReleases.addAll(installedBuiltIn);

app/src/cc/arduino/contributions/libraries/ui/DropdownInstalledLibraryItem.java

@@ -33,7 +33,8 @@
 import cc.arduino.contributions.libraries.LibrariesIndex;
 import cc.arduino.contributions.libraries.filters.InstalledLibraryPredicate;
 import cc.arduino.contributions.ui.DropdownItem;
-import com.google.common.base.Predicate;
+
+import java.util.function.Predicate;
 
 import static processing.app.I18n._;
 

app/src/cc/arduino/contributions/libraries/ui/DropdownLibraryOfCategoryItem.java

@@ -32,7 +32,8 @@
 import cc.arduino.contributions.libraries.ContributedLibrary;
 import cc.arduino.contributions.libraries.filters.CategoryPredicate;
 import cc.arduino.contributions.ui.DropdownItem;
-import com.google.common.base.Predicate;
+
+import java.util.function.Predicate;
 
 public class DropdownLibraryOfCategoryItem implements DropdownItem<ContributedLibrary> {
 

app/src/cc/arduino/contributions/libraries/ui/DropdownLibraryOfTypeItem.java

@@ -32,7 +32,8 @@
 import cc.arduino.contributions.libraries.ContributedLibrary;
 import cc.arduino.contributions.libraries.filters.TypePredicate;
 import cc.arduino.contributions.ui.DropdownItem;
-import com.google.common.base.Predicate;
+
+import java.util.function.Predicate;
 
 public class DropdownLibraryOfTypeItem implements DropdownItem<ContributedLibrary> {