Predicates: extracting anonymous inner classes for better reuse

arduino-core/src/cc/arduino/contributions/filters/DownloadableContributionWithVersionPredicate.java

@@ -0,0 +1,18 @@
+package cc.arduino.contributions.filters;
+
+import cc.arduino.contributions.packages.DownloadableContribution;
+import com.google.common.base.Predicate;
+
+public class DownloadableContributionWithVersionPredicate implements Predicate<DownloadableContribution> {
+  private final String version;
+
+  public DownloadableContributionWithVersionPredicate(String version) {
+    this.version = version;
+  }
+
+  @Override
+  public boolean apply(DownloadableContribution contribution) {
+    return version.equals(contribution.getParsedVersion());
+  }
+
+}

arduino-core/src/cc/arduino/contributions/libraries/LibrariesIndex.java

@@ -31,7 +31,7 @@ package cc.arduino.contributions.libraries;
 
 import cc.arduino.contributions.DownloadableContributionBuiltInAtTheBottomComparator;
 import cc.arduino.contributions.filters.InstalledPredicate;
-import com.google.common.base.Predicate;
+import cc.arduino.contributions.libraries.filters.LibraryWithNamePredicate;
 import com.google.common.collect.Collections2;
 
 import java.util.*;
@@ -41,12 +41,7 @@ public abstract class LibrariesIndex {
   public abstract List<ContributedLibrary> getLibraries();
 
   public List<ContributedLibrary> find(final String name) {
-    return new LinkedList<ContributedLibrary>(Collections2.filter(getLibraries(), new Predicate<ContributedLibrary>() {
+    return new LinkedList<ContributedLibrary>(Collections2.filter(getLibraries(), new LibraryWithNamePredicate(name)));
-      @Override
-      public boolean apply(ContributedLibrary contributedLibrary) {
-        return name.equals(contributedLibrary.getName());
-      }
-    }));
   }
 
   public ContributedLibrary find(String name, String version) {

arduino-core/src/cc/arduino/contributions/libraries/filters/LibraryWithNamePredicate.java

@@ -0,0 +1,19 @@
+package cc.arduino.contributions.libraries.filters;
+
+import cc.arduino.contributions.libraries.ContributedLibrary;
+import com.google.common.base.Predicate;
+
+public class LibraryWithNamePredicate implements Predicate<ContributedLibrary> {
+
+  private final String name;
+
+  public LibraryWithNamePredicate(String name) {
+    this.name = name;
+  }
+
+  @Override
+  public boolean apply(ContributedLibrary contributedLibrary) {
+    return name.equals(contributedLibrary.getName());
+  }
+
+}

arduino-core/src/cc/arduino/contributions/packages/ContributionInstaller.java

@@ -29,10 +29,10 @@
 package cc.arduino.contributions.packages;
 
 import cc.arduino.contributions.GPGDetachedSignatureVerifier;
+import cc.arduino.filters.FileExecutablePredicate;
 import cc.arduino.utils.ArchiveExtractor;
 import cc.arduino.utils.MultiStepProgress;
 import cc.arduino.utils.Progress;
-import com.google.common.base.Predicate;
 import com.google.common.collect.Collections2;
 import org.apache.commons.exec.CommandLine;
 import org.apache.commons.exec.Executor;
@@ -158,12 +158,7 @@ public class ContributionInstaller {
   }
 
   private void executePostInstallScriptIfAny(File folder) throws IOException {
-    Collection<File> postInstallScripts = Collections2.filter(BaseNoGui.getPlatform().postInstallScripts(folder), new Predicate<File>() {
+    Collection<File> postInstallScripts = Collections2.filter(BaseNoGui.getPlatform().postInstallScripts(folder), new FileExecutablePredicate());
-      @Override
-      public boolean apply(File file) {
-        return file.isFile() && file.exists() && file.canRead() && file.canExecute();
-      }
-    });
 
     if (postInstallScripts.isEmpty()) {
       String[] subfolders = folder.list(new OnlyDirs());

arduino-core/src/cc/arduino/contributions/packages/ContributionsIndex.java

@@ -29,9 +29,10 @@
 package cc.arduino.contributions.packages;
 
 import cc.arduino.contributions.DownloadableContributionBuiltInAtTheBottomComparator;
+import cc.arduino.contributions.filters.DownloadableContributionWithVersionPredicate;
 import cc.arduino.contributions.filters.InstalledPredicate;
+import cc.arduino.contributions.packages.filters.PlatformArchitecturePredicate;
 import com.google.common.base.Function;
-import com.google.common.base.Predicate;
 import com.google.common.collect.Collections2;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
@@ -59,12 +60,7 @@ public abstract class ContributionsIndex {
     if (aPackage == null) {
       return null;
     }
-    Collection<ContributedPlatform> platforms = Collections2.filter(aPackage.getPlatforms(), new Predicate<ContributedPlatform>() {
+    Collection<ContributedPlatform> platforms = Collections2.filter(aPackage.getPlatforms(), new PlatformArchitecturePredicate(platformArch));
-      @Override
-      public boolean apply(ContributedPlatform contributedPlatform) {
-        return platformArch.equals(contributedPlatform.getArchitecture());
-      }
-    });
     return Lists.newLinkedList(platforms);
   }
 
@@ -79,12 +75,7 @@ public abstract class ContributionsIndex {
       return null;
     }
 
-    Collection<ContributedPlatform> platforms = Collections2.filter(platformsByName, new Predicate<ContributedPlatform>() {
+    Collection<ContributedPlatform> platforms = Collections2.filter(platformsByName, new DownloadableContributionWithVersionPredicate(platformVersion));
-      @Override
-      public boolean apply(ContributedPlatform contributedPlatform) {
-        return platformVersion.equals(contributedPlatform.getParsedVersion());
-      }
-    });
     if (platforms.isEmpty()) {
       return null;
     }

arduino-core/src/cc/arduino/contributions/packages/filters/PlatformArchitecturePredicate.java

@@ -0,0 +1,19 @@
+package cc.arduino.contributions.packages.filters;
+
+import cc.arduino.contributions.packages.ContributedPlatform;
+import com.google.common.base.Predicate;
+
+public class PlatformArchitecturePredicate implements Predicate<ContributedPlatform> {
+
+  private final String platformArch;
+
+  public PlatformArchitecturePredicate(String platformArch) {
+    this.platformArch = platformArch;
+  }
+
+  @Override
+  public boolean apply(ContributedPlatform contributedPlatform) {
+    return platformArch.equals(contributedPlatform.getArchitecture());
+  }
+
+}

arduino-core/src/cc/arduino/filters/FileExecutablePredicate.java

@@ -0,0 +1,14 @@
+package cc.arduino.filters;
+
+import com.google.common.base.Predicate;
+
+import java.io.File;
+
+public class FileExecutablePredicate implements Predicate<File> {
+
+  @Override
+  public boolean apply(File file) {
+    return file.isFile() && file.exists() && file.canRead() && file.canExecute();
+  }
+
+}