Merge pull request #347 from operando/replace_collect_to_toList

Replace collect(Collectors.toList()) to Stream.toList().
DroidKaigi · Feb 15, 2017 · cc34c73 · cc34c73
2 parents 1599995 + 757b4e8
commit cc34c73
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 21 deletions.
diff --git a/app/src/main/java/io/github/droidkaigi/confsched2017/view/fragment/SettingsFragment.java b/app/src/main/java/io/github/droidkaigi/confsched2017/view/fragment/SettingsFragment.java
@@ -1,6 +1,5 @@
 package io.github.droidkaigi.confsched2017.view.fragment;
 
-import com.annimon.stream.Collectors;
 import com.annimon.stream.Stream;
 
 import android.content.Context;
@@ -72,11 +71,11 @@ public void showLanguagesDialog() {
         List<Locale> locales = LocaleUtil.SUPPORT_LANG;
         List<String> languages = Stream.of(locales)
                 .map(locale -> LocaleUtil.getDisplayLanguage(getContext(), locale))
-                .collect(Collectors.toList());
+                .toList();
 
         List<String> languageIds = Stream.of(locales)
                 .map(LocaleUtil::getLocaleLanguageId)
-                .collect(Collectors.toList());
+                .toList();
 
         String currentLanguageId = LocaleUtil.getCurrentLanguageId(getActivity());
         Timber.tag(TAG).d("current language_id: %s", currentLanguageId);

diff --git a/app/src/main/java/io/github/droidkaigi/confsched2017/viewmodel/ContributorsViewModel.java b/app/src/main/java/io/github/droidkaigi/confsched2017/viewmodel/ContributorsViewModel.java
@@ -1,6 +1,5 @@
 package io.github.droidkaigi.confsched2017.viewmodel;
 
-import com.annimon.stream.Collectors;
 import com.annimon.stream.Stream;
 
 import android.databinding.BaseObservable;
@@ -116,7 +115,7 @@ private void loadContributors(boolean refresh) {
                     ContributorViewModel viewModel = new ContributorViewModel(contributor);
                     viewModel.setCallback(this);
                     return viewModel;
-                }).collect(Collectors.toList()))
+                }).toList())
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(

diff --git a/app/src/main/java/io/github/droidkaigi/confsched2017/viewmodel/MySessionsViewModel.java b/app/src/main/java/io/github/droidkaigi/confsched2017/viewmodel/MySessionsViewModel.java
@@ -1,6 +1,5 @@
 package io.github.droidkaigi.confsched2017.viewmodel;
 
-import com.annimon.stream.Collectors;
 import com.annimon.stream.Stream;
 
 import android.content.Context;
@@ -67,7 +66,7 @@ private Single<List<MySession>> loadMySessions() {
         return mySessionsRepository.findAll()
                 .map(mySessions -> Stream.of(mySessions)
                         .sorted((lhs, rhs) -> lhs.session.stime.compareTo(rhs.session.stime))
-                        .collect(Collectors.toList()));
+                        .toList());
     }
 
     public void start(Context context) {
@@ -82,7 +81,7 @@ public void start(Context context) {
     }
 
     private List<MySessionViewModel> convertToViewModel(Context context, List<MySession> mySessions) {
-        return Stream.of(mySessions).map(mySession -> new MySessionViewModel(context , mySession)).collect(Collectors.toList());
+        return Stream.of(mySessions).map(mySession -> new MySessionViewModel(context, mySession)).toList();
     }
 
     private void renderMySessions(List<MySessionViewModel> mySessionViewModels) {

diff --git a/app/src/main/java/io/github/droidkaigi/confsched2017/viewmodel/SearchViewModel.java b/app/src/main/java/io/github/droidkaigi/confsched2017/viewmodel/SearchViewModel.java
@@ -1,6 +1,5 @@
 package io.github.droidkaigi.confsched2017.viewmodel;
 
-import com.annimon.stream.Collectors;
 import com.annimon.stream.Stream;
 
 import android.content.Context;
@@ -48,15 +47,15 @@ public Single<List<SearchResultViewModel>> getSearchResultViewModels(Context con
                 .map(sessions -> {
                     List<Session> filteredSessions = Stream.of(sessions)
                             .filter(session -> session.isSession() && session.speaker != null)
-                            .collect(Collectors.toList());
+                            .toList();
 
                     List<SearchResultViewModel> titleResults = Stream.of(filteredSessions)
                             .map(session -> {
                                 SearchResultViewModel viewModel = SearchResultViewModel
                                         .createTitleType(session, context, mySessionsRepository);
                                 viewModel.setCallback(callback);
                                 return viewModel;
-                            }).collect(Collectors.toList());
+                            }).toList();
 
                     List<SearchResultViewModel> descriptionResults = Stream.of(filteredSessions)
                             .map(session -> {
@@ -65,15 +64,15 @@ public Single<List<SearchResultViewModel>> getSearchResultViewModels(Context con
                                                 mySessionsRepository);
                                 viewModel.setCallback(callback);
                                 return viewModel;
-                            }).collect(Collectors.toList());
+                            }).toList();
 
                     List<SearchResultViewModel> speakerResults = Stream.of(filteredSessions)
                             .map(session -> {
                                 SearchResultViewModel viewModel = SearchResultViewModel
                                         .createSpeakerType(session, context, mySessionsRepository);
                                 viewModel.setCallback(callback);
                                 return viewModel;
-                            }).collect(Collectors.toList());
+                            }).toList();
 
                     titleResults.addAll(descriptionResults);
                     titleResults.addAll(speakerResults);

diff --git a/app/src/main/java/io/github/droidkaigi/confsched2017/viewmodel/SessionsViewModel.java b/app/src/main/java/io/github/droidkaigi/confsched2017/viewmodel/SessionsViewModel.java
@@ -1,6 +1,5 @@
 package io.github.droidkaigi.confsched2017.viewmodel;
 
-import com.annimon.stream.Collectors;
 import com.annimon.stream.Stream;
 
 import android.content.Context;
@@ -68,7 +67,7 @@ public Single<List<SessionViewModel>> getSessions(Locale locale, Context context
                                 boolean isMySession = mySessionMap.containsKey(session.id);
                                 return new SessionViewModel(session, context, rooms.size(), isMySession, mySessionsRepository);
                             })
-                            .collect(Collectors.toList());
+                            .toList();
                     return adjustViewModels(viewModels, context);
                 });
     }
@@ -146,7 +145,7 @@ private List<Date> extractStimes(List<Session> sessions) {
                 .map(session -> session.stime)
                 .sorted()
                 .distinct()
-                .collect(Collectors.toList());
+                .toList();
     }
 
     private List<Room> extractRooms(List<Session> sessions) {
@@ -155,7 +154,7 @@ private List<Room> extractRooms(List<Session> sessions) {
                 .filter(room -> room != null && room.id != 0)
                 .sorted((lhs, rhs) -> lhs.name.compareTo(rhs.name))
                 .distinct()
-                .collect(Collectors.toList());
+                .toList();
     }
 
     public List<Room> getRooms() {

diff --git a/app/src/main/java/io/github/droidkaigi/confsched2017/viewmodel/SponsorshipViewModel.java b/app/src/main/java/io/github/droidkaigi/confsched2017/viewmodel/SponsorshipViewModel.java
@@ -1,6 +1,5 @@
 package io.github.droidkaigi.confsched2017.viewmodel;
 
-import com.annimon.stream.Collectors;
 import com.annimon.stream.Stream;
 
 import android.databinding.BaseObservable;
@@ -49,6 +48,6 @@ public ObservableList<SponsorViewModel> getSponsorViewModels() {
     private List<SponsorViewModel> convertSponsor(Sponsorship sponsorship) {
         return Stream.of(sponsorship.sponsors)
                 .map(SponsorViewModel::new)
-                .collect(Collectors.toList());
+                .toList();
     }
 }
diff --git a/app/src/main/java/io/github/droidkaigi/confsched2017/viewmodel/SponsorshipsViewModel.java b/app/src/main/java/io/github/droidkaigi/confsched2017/viewmodel/SponsorshipsViewModel.java
@@ -3,7 +3,6 @@
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 
-import com.annimon.stream.Collectors;
 import com.annimon.stream.Stream;
 
 import android.databinding.BaseObservable;
@@ -84,7 +83,7 @@ private List<Sponsorship> transformSponsorships(String json) {
     }
 
     private List<SponsorshipViewModel> convertToViewModel(List<Sponsorship> sponsorships) {
-        return Stream.of(sponsorships).map(SponsorshipViewModel::new).collect(Collectors.toList());
+        return Stream.of(sponsorships).map(SponsorshipViewModel::new).toList();
     }
 
     private void renderSponsorships(List<SponsorshipViewModel> sponsorships) {