[isis] branch master updated: ISIS-3049: fixes prev. commit

[ah...@apache.org]

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 4c73f339e1 ISIS-3049: fixes prev. commit
4c73f339e1 is described below

commit 4c73f339e1e91a86d269bd5b7dbff9c43e788add
Author: andi-huber <ah...@apache.org>
AuthorDate: Fri Jul 1 13:36:44 2022 +0200

    ISIS-3049: fixes prev. commit
    
    - for the case when there is no ApplicationTenancyEvaluator registered
    for Spring
---
 .../integration/facets/TenantedAuthorizationPostProcessor.java     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/facets/TenantedAuthorizationPostProcessor.java b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/facets/TenantedAuthorizationPostProcessor.java
index 5d6d3f8387..80ca5c1cee 100644
--- a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/facets/TenantedAuthorizationPostProcessor.java
+++ b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/facets/TenantedAuthorizationPostProcessor.java
@@ -25,12 +25,14 @@ import java.util.stream.Collectors;
 import javax.inject.Inject;
 import javax.inject.Provider;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 import org.apache.isis.applib.services.queryresultscache.QueryResultsCache;
 import org.apache.isis.applib.services.registry.ServiceRegistry;
 import org.apache.isis.applib.services.user.UserService;
+import org.apache.isis.commons.internal.base._NullSafe;
 import org.apache.isis.core.metamodel.context.MetaModelContext;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facetapi.FacetUtil;
@@ -64,7 +66,7 @@ extends ObjectSpecificationPostProcessorAbstract {
     @Inject UserService userService;
     @Inject @Lazy ApplicationUserRepository userRepository;
     @Inject Provider<QueryResultsCache> queryResultsCacheProvider;
-    @Inject List<ApplicationTenancyEvaluator> applicationTenancyEvaluators;
+    @Autowired(required=false) List<ApplicationTenancyEvaluator> applicationTenancyEvaluators;
 
     @Inject
     public TenantedAuthorizationPostProcessor(final MetaModelContext metaModelContext) {
@@ -103,8 +105,7 @@ extends ObjectSpecificationPostProcessorAbstract {
             final Class<?> cls,
             final FacetHolder holder) {
 
-        val evaluators = applicationTenancyEvaluators
-                .stream()
+        val evaluators = _NullSafe.stream(applicationTenancyEvaluators)
                 .filter(evaluator -> evaluator.handles(cls))
                 .collect(Collectors.<ApplicationTenancyEvaluator>toList());