Apply fix from release branch to main (#234)

apply the fix from pr #221 to other queries in MessageStorage.java that
require ordering.

# Checklist

The following aspects have been respected by the author of this pull
request, confirmed by both pull request assignee **and** reviewer:

* Adherence to coding conventions
  * [x] Pull Request Assignee
  * [x] Reviewer
* Adherence to javadoc conventions
  * [x] Pull Request Assignee
  * [x] Reviewer
* Changelog update (necessity checked and entry added or not added
respectively)
  * [x] Pull Request Assignee
  * [x] Reviewer
* README update (necessity checked and entry added or not added
respectively)
  * [x] Pull Request Assignee
  * [x] Reviewer
* config update (necessity checked and entry added or not added
respectively)
  * [x] Pull Request Assignee
  * [x] Reviewer
* SDCcc executable ran against a test device (if necessary)
  * [x] Pull Request Assignee
  * [x] Reviewer

---------

Signed-off-by: Malte Grebe-Lüth <[email protected]>

sdccc/src/main/java/com/draeger/medical/sdccc/messages/MessageStorage.java

@@ -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
  */
@@ -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);
     }
 
     /**
@@ -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);
     }
 
     /**
@@ -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);
     }
 
     /**
@@ -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) {