[isis] branch spring6 updated: ISIS-3275: post merge fixes

[ah...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch spring6
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/spring6 by this push:
     new 1e91d0c221 ISIS-3275: post merge fixes
1e91d0c221 is described below

commit 1e91d0c221291b5f157aaea71d6405432fe5e6dc
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Dec 12 04:47:14 2022 +0100

    ISIS-3275: post merge fixes
---
 .../causeway/applib/services/user/RoleMemento.java |  3 ++-
 .../causeway/applib/services/user/UserMemento.java |  2 ++
 .../CustomContextWithNoPermissionChecksTest.java   | 23 ++++++++--------------
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/user/RoleMemento.java b/api/applib/src/main/java/org/apache/causeway/applib/services/user/RoleMemento.java
index e4122b51c2..cfde721dc8 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/user/RoleMemento.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/user/RoleMemento.java
@@ -32,6 +32,8 @@ import org.apache.causeway.applib.annotation.Nature;
 import org.apache.causeway.applib.annotation.PriorityPrecedence;
 import org.apache.causeway.applib.annotation.PropertyLayout;
 
+import lombok.Builder;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.Value;
@@ -42,7 +44,6 @@ import lombok.val;
  *
  * @since 1.x revised for 2.0 {@index}
  */
-@SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")
 @Named(RoleMemento.LOGICAL_TYPE_NAME)
 @DomainObject(
         nature = Nature.VIEW_MODEL)
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/services/user/UserMemento.java b/api/applib/src/main/java/org/apache/causeway/applib/services/user/UserMemento.java
index 9c9e0472f6..b78a7a49a3 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/services/user/UserMemento.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/services/user/UserMemento.java
@@ -46,10 +46,12 @@ import org.apache.causeway.applib.annotation.PropertyLayout;
 import org.apache.causeway.applib.annotation.Where;
 import org.apache.causeway.applib.locale.UserLocale;
 import org.apache.causeway.applib.services.iactnlayer.InteractionContext;
+import org.apache.causeway.applib.services.sudo.SudoService;
 import org.apache.causeway.commons.collections.Can;
 import org.apache.causeway.commons.internal.base._Strings;
 
 import lombok.Builder;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.With;
diff --git a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/CustomContextWithNoPermissionChecksTest.java b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/CustomContextWithNoPermissionChecksTest.java
index 36df5c6d34..d37393b6f5 100644
--- a/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/CustomContextWithNoPermissionChecksTest.java
+++ b/regressiontests/stable-interact/src/test/java/org/apache/causeway/testdomain/interact/CustomContextWithNoPermissionChecksTest.java
@@ -18,31 +18,24 @@
  */
 package org.apache.causeway.testdomain.interact;
 
-import lombok.val;
+import jakarta.inject.Inject;
 
-import java.time.Duration;
-import java.time.LocalDateTime;
-import java.util.Locale;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.TestPropertySource;
 
-import javax.inject.Inject;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import org.apache.causeway.applib.services.iactnlayer.InteractionService;
 import org.apache.causeway.core.config.presets.CausewayPresets;
-import org.apache.causeway.core.config.progmodel.ProgrammingModelConstants.DateTimeFormat;
 import org.apache.causeway.testdomain.conf.Configuration_headless;
 import org.apache.causeway.testdomain.model.interaction.Configuration_usingInteractionDomain;
 import org.apache.causeway.testing.integtestsupport.applib.CausewayIntegrationTestAbstract;
 import org.apache.causeway.testing.integtestsupport.applib.NoPermissionChecks;
-import org.apache.causeway.testing.integtestsupport.applib.annotation.InteractAs;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.TestPropertySource;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import lombok.val;
 
 @SpringBootTest(
         classes = {