KEYCLOAK-16033 Revert Jpa*EventQuery to getResultList

zozor · Oct 22, 2020 · f5c5234 · f5c5234
1 parent 74b5143
commit f5c5234
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/model/jpa/src/main/java/org/keycloak/events/jpa/JpaAdminEventQuery.java b/model/jpa/src/main/java/org/keycloak/events/jpa/JpaAdminEventQuery.java
@@ -160,7  160,7 @@ public Stream<AdminEvent> getResultStream() {
             query.setMaxResults(maxResults);
         }
 
-        return closing(query.getResultStream().map(JpaEventStoreProvider::convertAdminEvent));
         return closing(query.getResultList().stream().map(JpaEventStoreProvider::convertAdminEvent));
     }
 
 }
diff --git a/model/jpa/src/main/java/org/keycloak/events/jpa/JpaEventQuery.java b/model/jpa/src/main/java/org/keycloak/events/jpa/JpaEventQuery.java
@@ -134,7  134,7 @@ public Stream<Event> getResultStream() {
         }
 
 
-        return closing(query.getResultStream().map(JpaEventStoreProvider::convertEvent));
         return closing(query.getResultList().stream().map(JpaEventStoreProvider::convertEvent));
     }
 
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -134,7 134,7 @@ public Stream<Event> getResultStream() { @@
             }
-            return closing(query.getResultStream().map(JpaEventStoreProvider::convertEvent));
+            return closing(query.getResultList().stream().map(JpaEventStoreProvider::convertEvent));
         }
     }