You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/05/19 08:01:16 UTC
[isis] branch master updated: ISIS-2620: Demo: work on JPA
provisioning issues (3)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new aa99f8f ISIS-2620: Demo: work on JPA provisioning issues (3)
aa99f8f is described below
commit aa99f8f5efdab4f0a714188a351a75e6520e86fc
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed May 19 10:00:59 2021 +0200
ISIS-2620: Demo: work on JPA provisioning issues (3)
---
.../secman/jpa/permission/dom/ApplicationPermissionRepository.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/permission/dom/ApplicationPermissionRepository.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/permission/dom/ApplicationPermissionRepository.java
index f845452..c3eb5c2 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/permission/dom/ApplicationPermissionRepository.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/permission/dom/ApplicationPermissionRepository.java
@@ -28,7 +28,6 @@ import javax.inject.Named;
import org.springframework.stereotype.Repository;
import org.apache.isis.commons.internal.base._NullSafe;
-import org.apache.isis.extensions.secman.api.permission.dom.ApplicationPermission;
import org.apache.isis.extensions.secman.api.permission.dom.ApplicationPermissionRepositoryAbstract;
import org.apache.isis.extensions.secman.api.user.dom.ApplicationUser;
import org.apache.isis.extensions.secman.api.user.dom.ApplicationUserRepository;
@@ -46,7 +45,8 @@ extends ApplicationPermissionRepositoryAbstract<ApplicationPermission> {
// TODO NAMED_QUERY_FIND_BY_USER not working yet, using workaround ...
@Override
- public List<ApplicationPermission> findByUser(@NonNull final ApplicationUser user) {
+ public List<org.apache.isis.extensions.secman.api.permission.dom.ApplicationPermission>
+ findByUser(final @NonNull ApplicationUser user) {
final String username = user.getUsername();
return userRepository.findByUsername(username)
@@ -55,6 +55,7 @@ extends ApplicationPermissionRepositoryAbstract<ApplicationPermission> {
.map(roleStream -> roleStream
.map(this::findByRole)
.flatMap(List::stream)
+ .map(org.apache.isis.extensions.secman.api.permission.dom.ApplicationPermission.class::cast)
.collect(Collectors.toList()))
.orElse(Collections.emptyList());
}