Skip to content

chore: Improve Utils.Streams.asStream and Utils.Streams.asList #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mlakov merged 1 commit into from
Oct 23, 2026
Merged

chore: Improve Utils.Streams.asStream and Utils.Streams.asList #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions cds-feature-ord/src/main/java/com/sap/cds/feature/ord/common/Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import static com.sap.cds.feature.ord.common.Utils.Exceptions.asLocalizedErrorMessage;
import static com.sap.cds.services.utils.CdsErrorStatuses.ERROR_READING_ORD_DOCUMENT;
import static java.lang.Thread.currentThread;
import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;
import static java.util.Spliterator.ORDERED;
import static java.util.Spliterators.spliteratorUnknownSize;
Expand Down Expand Up @@ -82,12 +83,14 @@ public static ClassicHttpResponse assertSuccessful(ClassicHttpResponse response)
public static class Streams {

public static <T> Stream<T> asStream(Iterable<T> iterable) {
return StreamSupport.stream(iterable.spliterator(), false);
return isNull(iterable) ? Stream.empty() : StreamSupport.stream(iterable.spliterator(), false);
}

public static <T> List<T> asList(Iterator<T> iterator) {
return StreamSupport.stream(spliteratorUnknownSize(iterator, ORDERED), false)
.toList();
return isNull(iterator)
? List.of()
: StreamSupport.stream(spliteratorUnknownSize(iterator, ORDERED), false)
.toList();
}
}

Expand Down
2 changes: 2 additions & 0 deletions cds-feature-ord/src/test/java/com/sap/cds/feature/ord/common/UtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,13 @@ void givenStatusCodeIsError_whenHttpAssertSuccessfulIsCalled_thenExceptionIsThro

@Test
void whenStreamsAsStreamIsCalled_thenCorrectResultIsReturned() {
assertEquals(List.of(), Utils.Streams.asStream(null).toList());
assertEquals(List.of(1, 2, 3), Utils.Streams.asStream(List.of(1, 2, 3)).toList());
}

@Test
void whenStreamsAsListIsCalled_thenCorrectResultIsReturned() {
assertEquals(List.of(), Utils.Streams.asList(null));
assertEquals(List.of(1, 2, 3), Utils.Streams.asList(List.of(1, 2, 3).iterator()));
}

Expand Down
Loading