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/02/22 16:09:29 UTC
[isis] branch master updated: ISIS-2538: fixes non-compliant use of
SortedSet in entities
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 e56cba4 ISIS-2538: fixes non-compliant use of SortedSet in entities
e56cba4 is described below
commit e56cba495a5a8b9c30e7148fbf92411dad321783
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Feb 22 17:09:15 2021 +0100
ISIS-2538: fixes non-compliant use of SortedSet in entities
---
.../org/apache/isis/extensions/secman/api/user/ApplicationUser.java | 4 ++--
.../apache/isis/extensions/secman/jdo/dom/role/ApplicationRole.java | 4 ++--
.../apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.java | 4 ++--
.../apache/isis/extensions/secman/jpa/dom/role/ApplicationRole.java | 3 ++-
.../apache/isis/extensions/secman/jpa/dom/user/ApplicationUser.java | 3 +--
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/ApplicationUser.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/ApplicationUser.java
index dc40a86..6e321e5 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/ApplicationUser.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/ApplicationUser.java
@@ -18,7 +18,7 @@
*/
package org.apache.isis.extensions.secman.api.user;
-import java.util.SortedSet;
+import java.util.Set;
import org.apache.isis.commons.having.HasUsername;
import org.apache.isis.extensions.secman.api.IsisModuleExtSecmanApi;
@@ -87,7 +87,7 @@ public interface ApplicationUser extends HasUsername, HasAtPath {
ApplicationPermissionValueSet getPermissionSet();
- SortedSet<? extends ApplicationRole> getRoles();
+ Set<? extends ApplicationRole> getRoles();
ApplicationUserStatus getStatus();
void setStatus(ApplicationUserStatus disabled);
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRole.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRole.java
index 3af620b..a7f6ec4 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRole.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/role/ApplicationRole.java
@@ -20,7 +20,7 @@ package org.apache.isis.extensions.secman.jdo.dom.role;
import java.util.Comparator;
import java.util.List;
-import java.util.SortedSet;
+import java.util.Set;
import java.util.TreeSet;
import javax.inject.Inject;
@@ -174,7 +174,7 @@ implements org.apache.isis.extensions.secman.api.role.ApplicationRole, Comparabl
)
@MemberOrder(sequence = "20")
@Getter @Setter
- private SortedSet<ApplicationUser> users = new TreeSet<>();
+ private Set<ApplicationUser> users = new TreeSet<>();
// necessary for integration tests
diff --git a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.java b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.java
index af64ccf..1d95fec 100644
--- a/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.java
+++ b/extensions/security/secman/persistence-jdo/src/main/java/org/apache/isis/extensions/secman/jdo/dom/user/ApplicationUser.java
@@ -20,7 +20,7 @@ package org.apache.isis.extensions.secman.jdo.dom.user;
import java.util.List;
import java.util.Objects;
-import java.util.SortedSet;
+import java.util.Set;
import java.util.TreeSet;
import javax.inject.Inject;
@@ -378,7 +378,7 @@ org.apache.isis.extensions.secman.api.user.ApplicationUser {
)
@MemberOrder(sequence = "20")
@Getter @Setter
- private SortedSet<ApplicationRole> roles = new TreeSet<>();
+ private Set<ApplicationRole> roles = new TreeSet<>();
// -- PermissionSet (programmatic)
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/role/ApplicationRole.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/role/ApplicationRole.java
index 3189336..5d5d865 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/role/ApplicationRole.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/role/ApplicationRole.java
@@ -20,6 +20,7 @@ package org.apache.isis.extensions.secman.jpa.dom.role;
import java.util.Comparator;
import java.util.List;
+import java.util.Set;
import java.util.TreeSet;
import javax.inject.Inject;
@@ -185,7 +186,7 @@ implements
)
@MemberOrder(sequence = "20")
@Getter @Setter
- private TreeSet<ApplicationUser> users = new TreeSet<>();
+ private Set<ApplicationUser> users = new TreeSet<>();
// necessary for integration tests
diff --git a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/user/ApplicationUser.java b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/user/ApplicationUser.java
index cd136ca..6ad3afa 100644
--- a/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/user/ApplicationUser.java
+++ b/extensions/security/secman/persistence-jpa/src/main/java/org/apache/isis/extensions/secman/jpa/dom/user/ApplicationUser.java
@@ -21,7 +21,6 @@ package org.apache.isis.extensions.secman.jpa.dom.user;
import java.util.List;
import java.util.Objects;
import java.util.Set;
-import java.util.SortedSet;
import java.util.TreeSet;
import javax.inject.Inject;
@@ -376,7 +375,7 @@ org.apache.isis.extensions.secman.api.user.ApplicationUser {
)
@MemberOrder(sequence = "20")
@Getter @Setter
- private SortedSet<ApplicationRole> roles = new TreeSet<>();
+ private Set<ApplicationRole> roles = new TreeSet<>();
// -- PermissionSet (programmatic)