Compilation error

Fixes keycloak/keycloak#20972
keycloak · Jun 14, 2023 · 547f47c · 547f47c
1 parent 6a4e338
commit 547f47c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 32 deletions.
diff --git a/...storage-jpa/src/main/java/org/keycloak/quickstart/storage/user/MyUserStorageProvider.java b/...storage-jpa/src/main/java/org/keycloak/quickstart/storage/user/MyUserStorageProvider.java
@@ -40,7 +40,6 @@
 import org.keycloak.storage.user.UserRegistrationProvider;
 
 import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -227,40 +226,17 @@ public int getUsersCount(RealmModel realm) {
     }
 
     @Override
-    public Stream<UserModel> getUsersStream(RealmModel realm, Integer firstResult, Integer maxResults) {
-
-        TypedQuery<UserEntity> query = em.createNamedQuery("getAllUsers", UserEntity.class);
-        if (firstResult != -1) {
-            query.setFirstResult(firstResult);
-        }
-        if (maxResults != -1) {
-            query.setMaxResults(maxResults);
-        }
-        List<UserEntity> results = query.getResultList();
-        List<UserModel> users = new LinkedList<>();
-        for (UserEntity entity : results) users.add(new UserAdapter(session, realm, model, entity));
-        return users.stream();
-    }
-
-    @Override
-    public Stream<UserModel> searchForUserStream(RealmModel realm, String search, Integer firstResult, Integer maxResults) {
+    public Stream<UserModel> searchForUserStream(RealmModel realm, Map<String, String> params, Integer firstResult, Integer maxResults) {
+        String search = params.get(UserModel.SEARCH);
         TypedQuery<UserEntity> query = em.createNamedQuery("searchForUser", UserEntity.class);
         query.setParameter("search", "%" + search.toLowerCase() + "%");
-        if (firstResult != -1) {
+        if (firstResult != null) {
             query.setFirstResult(firstResult);
         }
-        if (maxResults != -1) {
+        if (maxResults != null) {
             query.setMaxResults(maxResults);
         }
-        List<UserEntity> results = query.getResultList();
-        List<UserModel> users = new LinkedList<>();
-        for (UserEntity entity : results) users.add(new UserAdapter(session, realm, model, entity));
-        return users.stream();
-    }
-
-    @Override
-    public Stream<UserModel> searchForUserStream(RealmModel realm, Map<String, String> params, Integer firstResult, Integer maxResults) {
-        return Stream.empty();
+        return query.getResultStream().map(entity -> new UserAdapter(session, realm, model, entity));
     }
 
     @Override

diff --git a/...sion/user-storage-jpa/src/main/java/org/keycloak/quickstart/storage/user/UserAdapter.java b/...sion/user-storage-jpa/src/main/java/org/keycloak/quickstart/storage/user/UserAdapter.java
@@ -27,6 +27,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Stream;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
@@ -123,13 +124,13 @@ public Map<String, List<String>> getAttributes() {
     }
 
     @Override
-    public List<String> getAttribute(String name) {
+    public Stream<String> getAttributeStream(String name) {
         if (name.equals("phone")) {
             List<String> phone = new LinkedList<>();
             phone.add(entity.getPhone());
-            return phone;
+            return phone.stream();
         } else {
-            return super.getAttribute(name);
+            return super.getAttributeStream(name);
         }
     }
 }