From 8c8a7d9496f77b1d8616fa918b434b1a4e7f7796 Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Sun, 1 Oct 2023 20:10:50 +0200 Subject: [PATCH] Cleanup: use stream.toList(). --- .../opentracks/data/CustomContentProviderUtilsTest.java | 5 ++--- .../de/dennisguse/opentracks/data/models/ActivityType.java | 3 +-- .../opentracks/io/file/exporter/ExportActivity.java | 5 ++--- .../opentracks/io/file/importer/ImportActivity.java | 3 +-- .../opentracks/io/file/importer/ImportViewModel.java | 3 +-- .../opentracks/io/file/importer/TrackImporter.java | 5 ++--- .../de/dennisguse/opentracks/settings/PreferencesUtils.java | 4 ++-- .../settings/bluetooth/BluetoothLeSensorPreference.java | 5 ++--- .../opentracks/ui/customRecordingLayout/RecordingLayout.java | 2 +- src/main/java/de/dennisguse/opentracks/util/ExportUtils.java | 3 +-- 10 files changed, 15 insertions(+), 23 deletions(-) diff --git a/src/androidTest/java/de/dennisguse/opentracks/data/CustomContentProviderUtilsTest.java b/src/androidTest/java/de/dennisguse/opentracks/data/CustomContentProviderUtilsTest.java index 94dc1238d..158e5fc91 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/data/CustomContentProviderUtilsTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/data/CustomContentProviderUtilsTest.java @@ -47,7 +47,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; import java.util.UUID; -import java.util.stream.Collectors; import de.dennisguse.opentracks.content.data.TestDataUtil; import de.dennisguse.opentracks.content.data.TestSensorDataUtil; @@ -860,7 +859,7 @@ public class CustomContentProviderUtilsTest { List trackpointIds = track.second.stream() .map(it -> ContentUris.parseId(contentProviderUtils.insertTrackPoint(it, track.first.getId()))) - .map(TrackPoint.Id::new).collect(Collectors.toList()); + .map(TrackPoint.Id::new).toList(); // when try (Cursor cursor = contentProviderUtils.getTrackPointCursor(trackId, trackpointIds.get(8))) { @@ -878,7 +877,7 @@ public class CustomContentProviderUtilsTest { List trackpointIds = track.second.stream() .map(it -> ContentUris.parseId(contentProviderUtils.insertTrackPoint(it, track.first.getId()))) - .map(TrackPoint.Id::new).collect(Collectors.toList()); + .map(TrackPoint.Id::new).toList(); TrackPoint.Id startTrackPointId = trackpointIds.get(0); diff --git a/src/main/java/de/dennisguse/opentracks/data/models/ActivityType.java b/src/main/java/de/dennisguse/opentracks/data/models/ActivityType.java index 5adc23dec..2c8bf6e35 100644 --- a/src/main/java/de/dennisguse/opentracks/data/models/ActivityType.java +++ b/src/main/java/de/dennisguse/opentracks/data/models/ActivityType.java @@ -7,7 +7,6 @@ import androidx.annotation.NonNull; import java.util.Arrays; import java.util.List; -import java.util.stream.Collectors; import de.dennisguse.opentracks.R; @@ -123,7 +122,7 @@ public enum ActivityType { return Arrays.stream(values()) .map(ActivityType::getLocalizedStringId) .map(context::getString) - .collect(Collectors.toList()); + .toList(); } @NonNull diff --git a/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java b/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java index ec8eb1461..d1a2335da 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java @@ -32,7 +32,6 @@ import androidx.fragment.app.FragmentActivity; import java.util.ArrayList; import java.util.List; import java.util.concurrent.LinkedBlockingQueue; -import java.util.stream.Collectors; import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.data.ContentProviderUtils; @@ -231,9 +230,9 @@ public class ExportActivity extends FragmentActivity implements ExportService.Ex exportTasks = new ArrayList<>(); if (allInOneFile) { String filename = "OpenTracks-Backup"; - exportTasks.add(new ExportTask(filename, trackFileFormat, tracks.stream().map(Track::getId).collect(Collectors.toList()))); + exportTasks.add(new ExportTask(filename, trackFileFormat, tracks.stream().map(Track::getId).toList())); } else { - exportTasks.addAll(tracks.stream().map(it -> new ExportTask(null, trackFileFormat, List.of(it.getId()))).collect(Collectors.toList())); + exportTasks.addAll(tracks.stream().map(it -> new ExportTask(null, trackFileFormat, List.of(it.getId()))).toList()); } trackExportTotalCount = exportTasks.size(); } diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportActivity.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportActivity.java index fbf8ac554..e739c8268 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportActivity.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportActivity.java @@ -32,7 +32,6 @@ import androidx.lifecycle.ViewModelProvider; import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.TrackRecordedActivity; @@ -100,7 +99,7 @@ public class ImportActivity extends FragmentActivity { documentFiles = new ArrayList<>(); documentFiles.add(DocumentFile.fromTreeUri(this, documentUris.get(0))); } else { - documentFiles = documentUris.stream().map(it -> DocumentFile.fromSingleUri(this, it)).collect(Collectors.toList()); + documentFiles = documentUris.stream().map(it -> DocumentFile.fromSingleUri(this, it)).toList(); } initViews(); diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportViewModel.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportViewModel.java index 41281b083..746c02238 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportViewModel.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/ImportViewModel.java @@ -12,7 +12,6 @@ import androidx.lifecycle.MutableLiveData; import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.data.models.Track; @@ -50,7 +49,7 @@ public class ImportViewModel extends AndroidViewModel implements ImportServiceRe List> nestedFileList = documentFiles.stream() .map(FileUtils::getFiles) // TODO flatMap(Collection::stream) fails with ClassCastException; try in the future again - .collect(Collectors.toList()); + .toList(); List fileList = new ArrayList<>(); nestedFileList.forEach(fileList::addAll); diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java index 72530d0f5..ac6030594 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/TrackImporter.java @@ -16,7 +16,6 @@ import java.util.Collections; import java.util.LinkedList; import java.util.List; import java.util.UUID; -import java.util.stream.Collectors; import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.data.ContentProviderUtils; @@ -223,7 +222,7 @@ public class TrackImporter { private void matchMarkers2TrackPoints(Track.Id trackId) { List trackPointsWithLocation = trackPoints.stream() .filter(TrackPoint::hasLocation) - .collect(Collectors.toList()); + .toList(); List todoMarkers = new LinkedList<>(markers); List doneMarkers = new LinkedList<>(); @@ -241,7 +240,7 @@ public class TrackImporter { && trackPoint.getLongitude() == it.getLongitude() && trackPoint.getTime().equals(it.getTime()) ) - .collect(Collectors.toList()); + .toList(); TrackStatistics statistics = updater.getTrackStatistics(); for (Marker marker : matchedMarkers) { diff --git a/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java b/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java index 9c40c4805..c4f42fab2 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java +++ b/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java @@ -724,7 +724,7 @@ public class PreferencesUtils { R.array.stats_custom_layout_fields_default_value_16, R.array.stats_custom_layout_fields_default_value_17, R.array.stats_custom_layout_fields_default_value_18 - ).map(id -> resources.obtainTypedArray(id)).collect(Collectors.toList()); + ).map(id -> resources.obtainTypedArray(id)).toList(); } @SuppressLint("ResourceType") @@ -799,7 +799,7 @@ public class PreferencesUtils { } public static List getAllCustomLayoutNames() { - return getAllCustomLayouts().stream().map(RecordingLayout::getName).collect(Collectors.toList()); + return getAllCustomLayouts().stream().map(RecordingLayout::getName).toList(); } public static void resetCustomLayoutPreferences() { diff --git a/src/main/java/de/dennisguse/opentracks/settings/bluetooth/BluetoothLeSensorPreference.java b/src/main/java/de/dennisguse/opentracks/settings/bluetooth/BluetoothLeSensorPreference.java index fc0ed34ef..588dd107b 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/bluetooth/BluetoothLeSensorPreference.java +++ b/src/main/java/de/dennisguse/opentracks/settings/bluetooth/BluetoothLeSensorPreference.java @@ -23,7 +23,6 @@ import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.stream.Collectors; import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.sensors.BluetoothUtils; @@ -136,7 +135,7 @@ public abstract class BluetoothLeSensorPreference extends DialogPreference { b.putParcelableArrayList(ARG_BLE_SERVICE_UUIDS, new ArrayList<>(sensorUUIDs.stream() .map(ServiceMeasurementUUID::serviceUUID) .map(ParcelUuid::new) - .collect(Collectors.toList()))); + .toList())); fragment.setArguments(b); return fragment; } @@ -202,7 +201,7 @@ public abstract class BluetoothLeSensorPreference extends DialogPreference { if (PreferencesUtils.getBluetoothFilterEnabled()) { scanFilter = serviceUUIDs.stream() .map(it -> new ScanFilter.Builder().setServiceUuid(it).build()) - .collect(Collectors.toList()); + .toList(); } ScanSettings.Builder scanSettingsBuilder = new ScanSettings.Builder(); diff --git a/src/main/java/de/dennisguse/opentracks/ui/customRecordingLayout/RecordingLayout.java b/src/main/java/de/dennisguse/opentracks/ui/customRecordingLayout/RecordingLayout.java index bc05ffd10..2cbaa2db5 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/customRecordingLayout/RecordingLayout.java +++ b/src/main/java/de/dennisguse/opentracks/ui/customRecordingLayout/RecordingLayout.java @@ -68,7 +68,7 @@ public class RecordingLayout implements Parcelable { public RecordingLayout toRecordingLayout(boolean visibility) { RecordingLayout result = new RecordingLayout(this.getName()); - result.addFields(dataFields.stream().filter(f -> f.isVisible() == visibility).collect(Collectors.toList())); + result.addFields(dataFields.stream().filter(f -> f.isVisible() == visibility).toList()); return result; } diff --git a/src/main/java/de/dennisguse/opentracks/util/ExportUtils.java b/src/main/java/de/dennisguse/opentracks/util/ExportUtils.java index 5883cf14f..7b7ee9284 100644 --- a/src/main/java/de/dennisguse/opentracks/util/ExportUtils.java +++ b/src/main/java/de/dennisguse/opentracks/util/ExportUtils.java @@ -16,7 +16,6 @@ import java.io.IOException; import java.io.OutputStream; import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; import de.dennisguse.opentracks.data.ContentProviderUtils; import de.dennisguse.opentracks.data.models.Track; @@ -54,7 +53,7 @@ public class ExportUtils { public static void exportTrack(Context context, DocumentFile directory, ExportTask exportTask) { ContentProviderUtils contentProviderUtils = new ContentProviderUtils(context); - List tracks = exportTask.getTrackIds().stream().map(contentProviderUtils::getTrack).collect(Collectors.toList()); + List tracks = exportTask.getTrackIds().stream().map(contentProviderUtils::getTrack).toList(); Uri exportDocumentFileUri; if (tracks.size() == 1) { exportDocumentFileUri = getExportDocumentFileUri(context, tracks.get(0), exportTask.getTrackFileFormat(), directory);