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 47c06d3fb3 ISIS-3172: minor: commons additions + secman cleanup
47c06d3fb3 is described below
commit 47c06d3fb3b6854811fd4cacd3d0d9410ab47ac7
Author: Andi Huber <[email protected]>
AuthorDate: Thu Aug 25 13:24:29 2022 +0200
ISIS-3172: minor: commons additions + secman cleanup
---
.../org/apache/isis/commons/collections/Can.java | 14 +++++----
.../apache/isis/commons/collections/Can_Empty.java | 6 ++++
.../isis/commons/collections/Can_Multiple.java | 5 ++++
.../isis/commons/collections/Can_Singleton.java | 8 +++++
.../user/dom/mixins/ApplicationUser_timeZone.java | 5 +++-
.../ApplicationUserManager_newLocalUser.java | 3 +-
...pplicationUserManager_newLocalUserAbstract.java | 35 ----------------------
7 files changed, 32 insertions(+), 44 deletions(-)
diff --git a/commons/src/main/java/org/apache/isis/commons/collections/Can.java
b/commons/src/main/java/org/apache/isis/commons/collections/Can.java
index 6c6cc6bb6d..1c8ac12598 100644
--- a/commons/src/main/java/org/apache/isis/commons/collections/Can.java
+++ b/commons/src/main/java/org/apache/isis/commons/collections/Can.java
@@ -698,17 +698,22 @@ extends Iterable<T>, Comparable<Can<T>>, Serializable {
// -- CONVERSIONS
/**
- * @return a serializable and immutable List, containing the elements of
this Can
+ * @return a serializable and immutable {@link List}, containing the
elements of this Can
*/
List<T> toList();
/**
- * @return a serializable and immutable Set, containing the elements of
this Can
+ * @return a (serializable and mutable) {@link ArrayList}, containing the
elements of this Can
+ */
+ List<T> toArrayList();
+
+ /**
+ * @return a serializable and immutable {@link Set}, containing the
elements of this Can
*/
Set<T> toSet();
/**
- * @return a serializable and immutable Set, containing the elements of
this Can
+ * @return a serializable and immutable {@link Set}, containing the
elements of this Can
*/
Set<T> toSet(@NonNull Consumer<T> onDuplicated);
@@ -740,7 +745,4 @@ extends Iterable<T>, Comparable<Can<T>>, Serializable {
*/
T[] toArray(Class<T> elementType);
-
-
-
}
diff --git
a/commons/src/main/java/org/apache/isis/commons/collections/Can_Empty.java
b/commons/src/main/java/org/apache/isis/commons/collections/Can_Empty.java
index 86729d443e..fea1cb76b4 100644
--- a/commons/src/main/java/org/apache/isis/commons/collections/Can_Empty.java
+++ b/commons/src/main/java/org/apache/isis/commons/collections/Can_Empty.java
@@ -37,6 +37,7 @@ import java.util.stream.Stream;
import org.springframework.lang.Nullable;
import org.apache.isis.commons.internal.base._Casts;
+import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import lombok.AccessLevel;
@@ -240,6 +241,11 @@ final class Can_Empty<T> implements Can<T> {
return Collections.emptyList(); // serializable and immutable
}
+ @Override
+ public List<T> toArrayList() {
+ return _Lists.newArrayList();
+ }
+
@Override
public Set<T> toSet() {
return Collections.emptySet(); // serializable and immutable
diff --git
a/commons/src/main/java/org/apache/isis/commons/collections/Can_Multiple.java
b/commons/src/main/java/org/apache/isis/commons/collections/Can_Multiple.java
index bbca6975f2..f3be114177 100644
---
a/commons/src/main/java/org/apache/isis/commons/collections/Can_Multiple.java
+++
b/commons/src/main/java/org/apache/isis/commons/collections/Can_Multiple.java
@@ -364,6 +364,11 @@ final class Can_Multiple<T> implements Can<T> {
return Collections.unmodifiableList(elements); // serializable and
immutable
}
+ @Override
+ public List<T> toArrayList() {
+ return _Lists.newArrayList(elements);
+ }
+
@Override
public Set<T> toSet() {
val set = _Sets.<T>newHashSet(); // serializable
diff --git
a/commons/src/main/java/org/apache/isis/commons/collections/Can_Singleton.java
b/commons/src/main/java/org/apache/isis/commons/collections/Can_Singleton.java
index 5649bd98a7..808e323ddd 100644
---
a/commons/src/main/java/org/apache/isis/commons/collections/Can_Singleton.java
+++
b/commons/src/main/java/org/apache/isis/commons/collections/Can_Singleton.java
@@ -40,6 +40,7 @@ import org.springframework.lang.Nullable;
import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.base._Objects;
+import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.exceptions._Exceptions;
import lombok.NonNull;
@@ -299,6 +300,13 @@ final class Can_Singleton<T> implements Can<T> {
return Collections.singletonList(element); // serializable and
immutable
}
+ @Override
+ public List<T> toArrayList() {
+ val list = _Lists.<T>newArrayList();
+ list.add(element);
+ return list;
+ }
+
@Override
public Set<T> toSet() {
return Collections.singleton(element); // serializable and immutable
diff --git
a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/dom/mixins/ApplicationUser_timeZone.java
b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/dom/mixins/ApplicationUser_timeZone.java
index 4377aac9e1..6048d2826b 100644
---
a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/dom/mixins/ApplicationUser_timeZone.java
+++
b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/dom/mixins/ApplicationUser_timeZone.java
@@ -26,13 +26,16 @@ import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.annotation.PropertyLayout;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.user.UserCurrentSessionTimeZoneHolder;
import org.apache.isis.commons.internal.base._Temporals;
import org.apache.isis.extensions.secman.applib.user.dom.ApplicationUser;
import lombok.RequiredArgsConstructor;
-@Property(editing = Editing.DISABLED)
+@Property(
+ editing = Editing.DISABLED,
+ hidden = Where.ALL_TABLES)
@PropertyLayout(
fieldSetId = "regional",
describedAs = "Timezone ID as stored in your current session.
(Logout/Login to change.)",
diff --git
a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/man/mixins/ApplicationUserManager_newLocalUser.java
b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/man/mixins/ApplicationUserManager_newLocalUser.java
index 32f3822136..d4adf6de52 100644
---
a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/man/mixins/ApplicationUserManager_newLocalUser.java
+++
b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/man/mixins/ApplicationUserManager_newLocalUser.java
@@ -53,8 +53,7 @@ import lombok.val;
sequence = "1"
)
@RequiredArgsConstructor
-public class ApplicationUserManager_newLocalUser
-extends ApplicationUserManager_newLocalUserAbstract {
+public class ApplicationUserManager_newLocalUser {
public static class DomainEvent
extends
IsisModuleExtSecmanApplib.ActionDomainEvent<ApplicationUserManager_newLocalUser>
{}
diff --git
a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/man/mixins/ApplicationUserManager_newLocalUserAbstract.java
b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/man/mixins/ApplicationUserManager_newLocalUserAbstract.java
deleted file mode 100644
index cc78510d57..0000000000
---
a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/man/mixins/ApplicationUserManager_newLocalUserAbstract.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.isis.extensions.secman.applib.user.man.mixins;
-
-/**
- * @apiNote This mixin requires concrete implementations associated with JPA
and JDO,
- * since action's type parameters are inspected for their compile time types
- * and the ApplicationRole here is just an interface that the framework has
not much
- * meta-model information to derive UI behavior from.
- *
- * @implNote due to current limitations, both the main and its supporting
methods have to be
- * overridden with the concrete subclasses.
- *
- */
-public abstract class ApplicationUserManager_newLocalUserAbstract {
-
-
-
-}
