Skip to content

Commit dae6e4f

Browse files
author
Federico Fissore
committed
Dropping Guava predicates in favour of java.util.function.Predicate
1 parent ad10624 commit dae6e4f

32 files changed

+100
-90
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import cc.arduino.contributions.packages.ContributedPlatform;
3636
import cc.arduino.view.Event;
3737
import com.google.common.base.Function;
38-
import com.google.common.base.Predicates;
3938
import com.google.common.collect.Collections2;
4039
import com.google.common.collect.Iterables;
4140
import com.google.common.collect.Lists;
@@ -48,6 +47,7 @@
4847
import java.awt.event.ActionEvent;
4948
import java.util.LinkedList;
5049
import java.util.List;
50+
import java.util.stream.Collectors;
5151

5252
import static processing.app.I18n._;
5353

@@ -80,7 +80,7 @@ public List<ContributedPlatform> apply(ContributedPackage input) {
8080
}
8181
})));
8282

83-
List<ContributedPlatform> installedBuiltInPlatforms = new LinkedList<ContributedPlatform>(Collections2.filter(contributedPlatforms, Predicates.and(new InstalledPredicate(), new BuiltInPredicate())));
83+
List<ContributedPlatform> installedBuiltInPlatforms = contributedPlatforms.stream().filter(new InstalledPredicate()).filter(new BuiltInPredicate()).collect(Collectors.toList());
8484
if (installedBuiltInPlatforms.size() != 1) {
8585
return;
8686
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929

3030
package cc.arduino.contributions.filters;
3131

32-
import com.google.common.base.Predicate;
32+
import java.util.function.Predicate;
3333

3434
public class NoopPredicate<T> implements Predicate<T> {
3535

3636
@Override
37-
public boolean apply(T input) {
37+
public boolean test(T input) {
3838
return true;
3939
}
4040

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
package cc.arduino.contributions.libraries.filters;
3131

3232
import cc.arduino.contributions.libraries.ContributedLibrary;
33-
import com.google.common.base.Predicate;
33+
34+
import java.util.function.Predicate;
3435

3536
public class CategoryPredicate implements Predicate<ContributedLibrary> {
3637

@@ -41,7 +42,7 @@ public CategoryPredicate(String category) {
4142
}
4243

4344
@Override
44-
public boolean apply(ContributedLibrary input) {
45+
public boolean test(ContributedLibrary input) {
4546
return input.getCategory() != null && category.equals(input.getCategory());
4647
}
4748

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,9 @@
3232
import cc.arduino.contributions.filters.InstalledPredicate;
3333
import cc.arduino.contributions.libraries.ContributedLibrary;
3434
import cc.arduino.contributions.libraries.LibrariesIndex;
35-
import com.google.common.base.Predicate;
36-
import com.google.common.collect.Collections2;
3735

38-
import java.util.Collection;
36+
import java.util.List;
37+
import java.util.function.Predicate;
3938

4039
public class InstalledLibraryPredicate implements Predicate<ContributedLibrary> {
4140

@@ -46,14 +45,15 @@ public InstalledLibraryPredicate(LibrariesIndex index) {
4645
}
4746

4847
@Override
49-
public boolean apply(ContributedLibrary input) {
48+
public boolean test(ContributedLibrary input) {
5049
if (input.isInstalled()) {
5150
return true;
5251
}
5352

54-
Collection<ContributedLibrary> installed = Collections2.filter(index.find(input.getName()), new InstalledPredicate());
55-
56-
return !installed.isEmpty();
53+
List<ContributedLibrary> libraries = index.find(input.getName());
54+
return libraries.stream()
55+
.filter(new InstalledPredicate())
56+
.count() > 0;
5757
}
5858

5959
@Override

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,14 @@
3030
package cc.arduino.contributions.libraries.filters;
3131

3232
import cc.arduino.contributions.libraries.ContributedLibrary;
33-
import com.google.common.base.Predicate;
3433
import processing.app.packages.UserLibrary;
3534

35+
import java.util.function.Predicate;
36+
3637
public class OnlyUpstreamReleasePredicate implements Predicate<ContributedLibrary> {
3738

3839
@Override
39-
public boolean apply(ContributedLibrary input) {
40+
public boolean test(ContributedLibrary input) {
4041
return !(input instanceof UserLibrary);
4142
}
4243

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import cc.arduino.contributions.VersionComparator;
44
import cc.arduino.contributions.libraries.ContributedLibrary;
55
import cc.arduino.contributions.libraries.LibrariesIndexer;
6-
import com.google.common.base.Predicate;
76
import processing.app.packages.UserLibrary;
87

98
import java.util.List;
9+
import java.util.function.Predicate;
1010

1111
public class UpdatableLibraryPredicate implements Predicate<ContributedLibrary> {
1212

@@ -19,7 +19,7 @@ public UpdatableLibraryPredicate(LibrariesIndexer indexer) {
1919
}
2020

2121
@Override
22-
public boolean apply(ContributedLibrary contributedLibrary) {
22+
public boolean test(ContributedLibrary contributedLibrary) {
2323
String libraryName = contributedLibrary.getName();
2424
UserLibrary installed = indexer.getInstalledLibraries().getByName(libraryName);
2525
if (installed == null) {

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

+4-6
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@
4040
import cc.arduino.contributions.ui.listeners.DelegatingKeyListener;
4141
import cc.arduino.utils.ReverseComparator;
4242
import com.google.common.base.Function;
43-
import com.google.common.base.Predicates;
44-
import com.google.common.collect.Collections2;
4543
import com.google.common.collect.Lists;
4644
import processing.app.Base;
4745

@@ -58,8 +56,8 @@
5856
import java.awt.event.ItemEvent;
5957
import java.awt.event.ItemListener;
6058
import java.util.Collections;
61-
import java.util.LinkedList;
6259
import java.util.List;
60+
import java.util.stream.Collectors;
6361

6462
import static processing.app.I18n._;
6563
import static processing.app.I18n.format;
@@ -248,10 +246,10 @@ public Component getTableCellEditorComponent(JTable table, Object value,
248246

249247
final ContributedLibrary installed = editorValue.getInstalled();
250248

251-
List<ContributedLibrary> releases = new LinkedList<ContributedLibrary>(Collections2.filter(editorValue.releases, new OnlyUpstreamReleasePredicate()));
252-
List<ContributedLibrary> uninstalledReleases = new LinkedList<ContributedLibrary>(Collections2.filter(releases, Predicates.not(new InstalledPredicate())));
249+
List<ContributedLibrary> releases = editorValue.releases.stream().filter(new OnlyUpstreamReleasePredicate()).collect(Collectors.toList());
250+
List<ContributedLibrary> uninstalledReleases = releases.stream().filter(new InstalledPredicate().negate()).collect(Collectors.toList());
253251

254-
List<ContributedLibrary> installedBuiltIn = new LinkedList<ContributedLibrary>(Collections2.filter(releases, Predicates.and(new InstalledPredicate(), new BuiltInPredicate())));
252+
List<ContributedLibrary> installedBuiltIn = releases.stream().filter(new InstalledPredicate()).filter(new BuiltInPredicate()).collect(Collectors.toList());
255253

256254
if (installed != null && !installedBuiltIn.contains(installed)) {
257255
uninstalledReleases.addAll(installedBuiltIn);

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@
3333
import cc.arduino.contributions.libraries.LibrariesIndex;
3434
import cc.arduino.contributions.libraries.filters.InstalledLibraryPredicate;
3535
import cc.arduino.contributions.ui.DropdownItem;
36-
import com.google.common.base.Predicate;
36+
37+
import java.util.function.Predicate;
3738

3839
import static processing.app.I18n._;
3940

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
import cc.arduino.contributions.libraries.ContributedLibrary;
3333
import cc.arduino.contributions.libraries.filters.CategoryPredicate;
3434
import cc.arduino.contributions.ui.DropdownItem;
35-
import com.google.common.base.Predicate;
35+
36+
import java.util.function.Predicate;
3637

3738
public class DropdownLibraryOfCategoryItem implements DropdownItem<ContributedLibrary> {
3839

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
import cc.arduino.contributions.libraries.ContributedLibrary;
3333
import cc.arduino.contributions.libraries.filters.TypePredicate;
3434
import cc.arduino.contributions.ui.DropdownItem;
35-
import com.google.common.base.Predicate;
35+
36+
import java.util.function.Predicate;
3637

3738
public class DropdownLibraryOfTypeItem implements DropdownItem<ContributedLibrary> {
3839

‎app/src/cc/arduino/contributions/libraries/ui/DropdownUpdatableLibrariesItem.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
import cc.arduino.contributions.libraries.LibrariesIndexer;
55
import cc.arduino.contributions.libraries.filters.UpdatableLibraryPredicate;
66
import cc.arduino.contributions.ui.DropdownItem;
7-
import com.google.common.base.Predicate;
7+
8+
import java.util.function.Predicate;
89

910
import static processing.app.I18n._;
1011

‎app/src/cc/arduino/contributions/libraries/ui/LibrariesIndexTableModel.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@
3535
import cc.arduino.contributions.libraries.LibrariesIndexer;
3636
import cc.arduino.contributions.packages.ContributedPlatform;
3737
import cc.arduino.contributions.ui.FilteredAbstractTableModel;
38-
import com.google.common.base.Predicate;
39-
import com.google.common.base.Predicates;
40-
import com.google.common.collect.Collections2;
4138

4239
import java.util.ArrayList;
4340
import java.util.Collections;
4441
import java.util.LinkedList;
4542
import java.util.List;
43+
import java.util.function.Predicate;
44+
import java.util.stream.Collectors;
45+
import java.util.stream.Stream;
4646

4747
@SuppressWarnings("serial")
4848
public class LibrariesIndexTableModel extends FilteredAbstractTableModel<ContributedLibrary> {
@@ -79,7 +79,7 @@ public void add(ContributedLibrary library) {
7979
}
8080

8181
public ContributedLibrary getInstalled() {
82-
List<ContributedLibrary> installedReleases = new LinkedList<ContributedLibrary>(Collections2.filter(releases, new InstalledPredicate()));
82+
List<ContributedLibrary> installedReleases = releases.stream().filter(new InstalledPredicate()).collect(Collectors.toList());
8383
Collections.sort(installedReleases, new DownloadableContributionBuiltInAtTheBottomComparator());
8484

8585
if (installedReleases.isEmpty()) {
@@ -127,8 +127,8 @@ public void setIndexer(LibrariesIndexer _index) {
127127
Predicate<ContributedLibrary> selectedCategoryFilter = null;
128128
String selectedFilters[] = null;
129129

130-
public void updateIndexFilter(String filters[], Predicate<ContributedLibrary>... additionalFilters) {
131-
selectedCategoryFilter = Predicates.and(additionalFilters);
130+
public void updateIndexFilter(String filters[], Stream<Predicate<ContributedLibrary>> additionalFilters) {
131+
selectedCategoryFilter = additionalFilters.reduce(Predicate::and).get();
132132
selectedFilters = filters;
133133
update();
134134
}
@@ -229,7 +229,7 @@ public void update() {
229229
}
230230

231231
private void applyFilterToLibrary(ContributedLibrary lib) {
232-
if (selectedCategoryFilter != null && !selectedCategoryFilter.apply(lib)) {
232+
if (selectedCategoryFilter != null && !selectedCategoryFilter.test(lib)) {
233233
return;
234234
}
235235
if (!stringContainsAll(lib.getName(), selectedFilters) && !stringContainsAll(lib.getParagraph(), selectedFilters) && !stringContainsAll(lib.getSentence(), selectedFilters)) {

‎app/src/cc/arduino/contributions/libraries/ui/LibraryManagerUI.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import cc.arduino.contributions.libraries.LibraryTypeComparator;
3737
import cc.arduino.contributions.ui.*;
3838
import cc.arduino.utils.Progress;
39-
import com.google.common.base.Predicate;
4039
import processing.app.Platform;
4140

4241
import javax.swing.*;
@@ -46,6 +45,7 @@
4645
import java.util.Collection;
4746
import java.util.Collections;
4847
import java.util.LinkedList;
48+
import java.util.function.Predicate;
4949

5050
import static processing.app.I18n._;
5151

‎app/src/cc/arduino/contributions/packages/filters/CategoryPredicate.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
package cc.arduino.contributions.packages.filters;
3131

3232
import cc.arduino.contributions.packages.ContributedPlatform;
33-
import com.google.common.base.Predicate;
33+
34+
import java.util.function.Predicate;
3435

3536
public class CategoryPredicate implements Predicate<ContributedPlatform> {
3637

@@ -41,7 +42,7 @@ public CategoryPredicate(String category) {
4142
}
4243

4344
@Override
44-
public boolean apply(ContributedPlatform input) {
45+
public boolean test(ContributedPlatform input) {
4546
return input.getCategory() != null && category.equals(input.getCategory());
4647
}
4748

‎app/src/cc/arduino/contributions/packages/filters/UpdatablePlatformPredicate.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import cc.arduino.contributions.VersionComparator;
44
import cc.arduino.contributions.packages.ContributedPlatform;
55
import cc.arduino.contributions.packages.ContributionsIndexer;
6-
import com.google.common.base.Predicate;
76

87
import java.util.List;
8+
import java.util.function.Predicate;
99

1010
public class UpdatablePlatformPredicate implements Predicate<ContributedPlatform> {
1111

@@ -18,7 +18,7 @@ public UpdatablePlatformPredicate(ContributionsIndexer indexer) {
1818
}
1919

2020
@Override
21-
public boolean apply(ContributedPlatform contributedPlatform) {
21+
public boolean test(ContributedPlatform contributedPlatform) {
2222
String packageName = contributedPlatform.getParentPackage().getName();
2323
String architecture = contributedPlatform.getArchitecture();
2424

‎app/src/cc/arduino/contributions/packages/ui/ContributedPlatformTableCell.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@
4141
import cc.arduino.contributions.ui.listeners.DelegatingKeyListener;
4242
import cc.arduino.utils.ReverseComparator;
4343
import com.google.common.base.Function;
44-
import com.google.common.base.Predicates;
45-
import com.google.common.collect.Collections2;
4644
import com.google.common.collect.Lists;
4745
import processing.app.Base;
4846

@@ -60,6 +58,7 @@
6058
import java.awt.event.ItemListener;
6159
import java.util.Collections;
6260
import java.util.LinkedList;
61+
import java.util.stream.Collectors;
6362

6463
import static processing.app.I18n._;
6564
import static processing.app.I18n.format;
@@ -265,9 +264,9 @@ public Component getTableCellEditorComponent(JTable table, Object value,
265264
final ContributedPlatform installed = editorValue.getInstalled();
266265

267266
java.util.List<ContributedPlatform> releases = new LinkedList<ContributedPlatform>(editorValue.releases);
268-
java.util.List<ContributedPlatform> uninstalledReleases = new LinkedList<ContributedPlatform>(Collections2.filter(releases, Predicates.not(new InstalledPredicate())));
267+
java.util.List<ContributedPlatform> uninstalledReleases = releases.stream().filter(new InstalledPredicate().negate()).collect(Collectors.toList());
269268

270-
java.util.List<ContributedPlatform> installedBuiltIn = new LinkedList<ContributedPlatform>(Collections2.filter(releases, Predicates.and(new InstalledPredicate(), new BuiltInPredicate())));
269+
java.util.List<ContributedPlatform> installedBuiltIn = releases.stream().filter(new InstalledPredicate()).filter(new BuiltInPredicate()).collect(Collectors.toList());
271270

272271
if (installed != null && !installedBuiltIn.contains(installed)) {
273272
uninstalledReleases.addAll(installedBuiltIn);

‎app/src/cc/arduino/contributions/packages/ui/ContributionIndexTableModel.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@
3535
import cc.arduino.contributions.packages.ContributedPlatform;
3636
import cc.arduino.contributions.packages.ContributionsIndexer;
3737
import cc.arduino.contributions.ui.FilteredAbstractTableModel;
38-
import com.google.common.base.Predicate;
39-
import com.google.common.base.Predicates;
40-
import com.google.common.collect.Collections2;
4138

4239
import java.util.ArrayList;
4340
import java.util.Collections;
4441
import java.util.LinkedList;
4542
import java.util.List;
43+
import java.util.function.Predicate;
44+
import java.util.stream.Collectors;
45+
import java.util.stream.Stream;
4646

4747
@SuppressWarnings("serial")
4848
public class ContributionIndexTableModel extends FilteredAbstractTableModel<ContributedPlatform> {
@@ -80,7 +80,7 @@ public void add(ContributedPlatform platform) {
8080
}
8181

8282
public ContributedPlatform getInstalled() {
83-
List<ContributedPlatform> installedReleases = new LinkedList<ContributedPlatform>(Collections2.filter(releases, new InstalledPredicate()));
83+
List<ContributedPlatform> installedReleases = releases.stream().filter(new InstalledPredicate()).collect(Collectors.toList());
8484
Collections.sort(installedReleases, new DownloadableContributionBuiltInAtTheBottomComparator());
8585

8686
if (installedReleases.isEmpty()) {
@@ -120,12 +120,12 @@ public void setIndexer(ContributionsIndexer indexer) {
120120
this.indexer = indexer;
121121
}
122122

123-
public void updateIndexFilter(String filters[], Predicate<ContributedPlatform>... additionalFilters) {
123+
public void updateIndexFilter(String filters[], Stream<Predicate<ContributedPlatform>> additionalFilters) {
124124
contributions.clear();
125-
Predicate<ContributedPlatform> filter = Predicates.and(additionalFilters);
125+
Predicate<ContributedPlatform> filter = additionalFilters.reduce(Predicate::and).get();
126126
for (ContributedPackage pack : indexer.getPackages()) {
127127
for (ContributedPlatform platform : pack.getPlatforms()) {
128-
if (!filter.apply(platform)) {
128+
if (!filter.test(platform)) {
129129
continue;
130130
}
131131
if (!stringContainsAll(platform.getName(), filters))

‎app/src/cc/arduino/contributions/packages/ui/DropdownAllCoresItem.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
import cc.arduino.contributions.filters.NoopPredicate;
3333
import cc.arduino.contributions.packages.ContributedPlatform;
3434
import cc.arduino.contributions.ui.DropdownItem;
35-
import com.google.common.base.Predicate;
35+
36+
import java.util.function.Predicate;
3637

3738
import static processing.app.I18n._;
3839

‎app/src/cc/arduino/contributions/packages/ui/DropdownCoreOfCategoryItem.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
import cc.arduino.contributions.packages.ContributedPlatform;
3333
import cc.arduino.contributions.packages.filters.CategoryPredicate;
3434
import cc.arduino.contributions.ui.DropdownItem;
35-
import com.google.common.base.Predicate;
35+
36+
import java.util.function.Predicate;
3637

3738
public class DropdownCoreOfCategoryItem implements DropdownItem<ContributedPlatform> {
3839

0 commit comments

Comments
 (0)