karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Cleanup: simplify stream by using List operations (desugar).

Browse Source
This commit is contained in:
Dennis Guse
2025-10-16 22:50:38 +02:00
parent 73872e8926
commit daeb972c8a
10 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/io/file/TrackFilenameGenerator.java
+1 -4
View File
@@ -10,8 +10,6 @@ import java.util.Map;
import java.util.UUID;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import de.dennisguse.opentracks.data.models.Track;
import de.dennisguse.opentracks.util.FileUtils;
@@ -25,8 +23,7 @@ public class TrackFilenameGenerator {
public static final String STARTTIME_DATE_KEY = "{date}";
public static String getAllOptions() {
return Stream.of(UUID_KEY, TRACKNAME_KEY, ACTIVITY_TYPE_KEY, STARTTIME_TIME_KEY, STARTTIME_DATE_KEY)
.collect(Collectors.joining(", "));
return String.join(", ", UUID_KEY, TRACKNAME_KEY, ACTIVITY_TYPE_KEY, STARTTIME_TIME_KEY, STARTTIME_DATE_KEY);
}
public static String format(@NonNull String name, @NonNull TrackFileFormat trackFileFormat) {
src/main/java/de/dennisguse/opentracks/io/file/exporter/ExportActivity.java
+1 -1
View File
@@ -225,7 +225,7 @@ public class ExportActivity extends AbstractActivity {
String filename = "OpenTracks-Backup";
exportTasks.add(new ExportTask(filename, trackFileFormat, tracks.stream().map(Track::getId).collect(Collectors.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();
}
src/main/java/de/dennisguse/opentracks/io/file/importer/Importer.java
+1 -2
View File
@@ -12,7 +12,6 @@ import androidx.work.WorkRequest;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import de.dennisguse.opentracks.R;
import de.dennisguse.opentracks.data.models.Track;
@@ -38,7 +37,7 @@ public class Importer {
List<ArrayList<DocumentFile>> nestedFileList = documentFiles.stream()
.map(FileUtils::getFiles)
.collect(Collectors.toList());
.toList();
List<DocumentFile> fileList = new ArrayList<>();
nestedFileList.forEach(fileList::addAll);