[causeway] branch spring6 updated: Merge remote-tracking branch 'origin/master' into spring6

[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/causeway.git


The following commit(s) were added to refs/heads/spring6 by this push:
     new 1009c3f5fa Merge remote-tracking branch 'origin/master' into spring6
1009c3f5fa is described below

commit 1009c3f5fa9072e3c9fa12ca74f4aad7e51121ee
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Mar 17 18:37:37 2023 +0100

    Merge remote-tracking branch 'origin/master' into spring6
---
 .../config/beans/CausewayDomainObjectScope.java    | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayDomainObjectScope.java b/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayDomainObjectScope.java
index 2f313d2b48..cbd8993246 100644
--- a/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayDomainObjectScope.java
+++ b/core/config/src/main/java/org/apache/causeway/core/config/beans/CausewayDomainObjectScope.java
@@ -18,21 +18,19 @@
  */
 package org.apache.causeway.core.config.beans;
 
-import lombok.RequiredArgsConstructor;
-import lombok.extern.log4j.Log4j2;
-
 import java.util.UUID;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.ObjectFactory;
+import org.springframework.beans.factory.config.Scope;
 
 import org.apache.causeway.applib.services.bookmark.Bookmark;
 import org.apache.causeway.applib.services.bookmark.BookmarkService;
 import org.apache.causeway.applib.services.iactn.Interaction;
 import org.apache.causeway.applib.services.iactnlayer.InteractionService;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.ObjectFactory;
-import org.springframework.beans.factory.config.Scope;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.log4j.Log4j2;
 
 @RequiredArgsConstructor
 @Log4j2
@@ -41,7 +39,7 @@ class CausewayDomainObjectScope implements Scope {
     private final BeanFactory beanFactory;
 
     @Override
-    public Object get(String name, ObjectFactory<?> objectFactory) {
+    public Object get(final String name, final ObjectFactory<?> objectFactory) {
         if (!interactionService().isInInteraction()) {
             throw new IllegalStateException("No Causeway Interaction is currently active");
         }
@@ -51,12 +49,12 @@ class CausewayDomainObjectScope implements Scope {
     }
 
     @Override
-    public Object remove(String name) {
+    public Object remove(final String name) {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public void registerDestructionCallback(String name, Runnable runnable) {
+    public void registerDestructionCallback(final String name, final Runnable runnable) {
         if (!interactionService().isInInteraction()) {
             throw new IllegalStateException("No Causeway Interaction is currently active");
         }
@@ -64,7 +62,7 @@ class CausewayDomainObjectScope implements Scope {
     }
 
     @Override
-    public Object resolveContextualObject(String key) {
+    public Object resolveContextualObject(final String key) {
         return bookmarkService();
     }