Skip to content
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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Apply fix from release branch to main #234

Merged
merged 2 commits into from
Feb 6, 2025
Merged

Apply fix from release branch to main #234

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d41afd
fixed: the fix from pr #221 is now applied to other queries in Messag…
belagertem Jan 29, 2025
d830fab
refactor: removed unchecked cast from StreamDecorator to Stream in Me…
belagertem Feb 6, 2025
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
22 changes: 14 additions & 8 deletions sdccc/src/main/java/com/draeger/medical/sdccc/messages/MessageStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* This Source Code Form is subject to the terms of the MIT License.
* Copyright (c) 2023-2024 Draegerwerk AG & Co. KGaA.
* Copyright (c) 2023-2025 Draegerwerk AG & Co. KGaA.
*
* SPDX-License-Identifier: MIT
*/
Expand Down Expand Up @@ -1494,11 +1494,11 @@ public GetterResult<MessageContent> getInboundMessagesByBodyTypeAndSequenceId(
}

final boolean present;
try (final Stream<MessageContent> countingStream = this.getQueryResult(messageContentQuery)) {
try (final Stream<MessageContent> countingStream = this.getOrderedQueryResult(messageContentQuery)) {
present = countingStream.findAny().isPresent();
}

return new GetterResult<>(this.getQueryResult(messageContentQuery), present);
return new GetterResult<>(this.getOrderedQueryResult(messageContentQuery), present);
}

/**
Expand Down Expand Up @@ -1571,11 +1571,17 @@ public GetterResult<MessageContent> getInboundMessagesByBodyType(
}

final boolean present;
try (final Stream<MessageContent> countingStream = this.getQueryResult(messageContentQuery)) {
try (final Stream<MessageContent> countingStream = enableSorting
? this.getOrderedQueryResult(messageContentQuery)
: this.getQueryResult(messageContentQuery)) {
present = countingStream.findAny().isPresent();
}

return new GetterResult<>(this.getQueryResult(messageContentQuery), present);
return new GetterResult<>(
enableSorting
? this.getOrderedQueryResult(messageContentQuery)
: this.getQueryResult(messageContentQuery),
present);
}

/**
Expand Down Expand Up @@ -1621,11 +1627,11 @@ public GetterResult<ManipulationData> getManipulationData() throws IOException {
}

final boolean present;
try (final Stream<ManipulationData> countingStream = this.getQueryResult(criteria)) {
try (final Stream<ManipulationData> countingStream = this.getOrderedQueryResult(criteria)) {
present = countingStream.findAny().isPresent();
}

return new GetterResult<>(this.getQueryResult(criteria), present);
return new GetterResult<>(this.getOrderedQueryResult(criteria), present);
}

/**
Expand Down Expand Up @@ -1957,7 +1963,7 @@ private <T> Stream<T> getOrderedStreamForQuery(final Session session, final Crit
final Spliterator<T> spliterator =
Spliterators.spliteratorUnknownSize(iterator, Spliterator.NONNULL | Spliterator.ORDERED);

return (Stream<T>) new StreamDecorator(StreamSupport.stream(spliterator, false), scrollableResults::close);
return new StreamDecorator<>(StreamSupport.stream(spliterator, false), scrollableResults::close);
}

private void transmit(final List<DatabaseEntry> results) {
Expand Down