[isis] branch ISIS-2867 updated: ISIS-2867: fixes compile issue with TableColumnVisibilityServiceForSecman

[da...@apache.org]

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

danhaywood pushed a commit to branch ISIS-2867
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/ISIS-2867 by this push:
     new 34fd71e  ISIS-2867: fixes compile issue with TableColumnVisibilityServiceForSecman
34fd71e is described below

commit 34fd71ef18bbca11160f13436a819316d519f804
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Mon Sep 6 17:21:20 2021 +0100

    ISIS-2867: fixes compile issue with TableColumnVisibilityServiceForSecman
---
 .../apache/isis/extensions/secman/applib/user/menu/MeService.java   | 1 -
 .../integration/spiimpl/TableColumnVisibilityServiceForSecman.java  | 6 ++++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/menu/MeService.java b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/menu/MeService.java
index 9dafa4c..432e53b 100644
--- a/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/menu/MeService.java
+++ b/extensions/security/secman/applib/src/main/java/org/apache/isis/extensions/secman/applib/user/menu/MeService.java
@@ -85,7 +85,6 @@ public class MeService {
             //group = "Security",
             sequence = "100"
             )
-
     public class me{
 
         public class ActionEvent extends ActionDomainEvent<me> {}
diff --git a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/spiimpl/TableColumnVisibilityServiceForSecman.java b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/spiimpl/TableColumnVisibilityServiceForSecman.java
index fc1f091..b27b384 100644
--- a/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/spiimpl/TableColumnVisibilityServiceForSecman.java
+++ b/extensions/security/secman/integration/src/main/java/org/apache/isis/extensions/secman/integration/spiimpl/TableColumnVisibilityServiceForSecman.java
@@ -21,11 +21,12 @@ package org.apache.isis.extensions.secman.integration.spiimpl;
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import org.apache.isis.applib.annotation.PriorityPrecedence;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
+import org.apache.isis.applib.annotation.PriorityPrecedence;
 import org.apache.isis.applib.services.appfeat.ApplicationFeatureId;
+import org.apache.isis.applib.services.factory.FactoryService;
 import org.apache.isis.applib.services.tablecol.TableColumnVisibilityService;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.specloader.SpecificationLoader;
@@ -43,11 +44,12 @@ import lombok.val;
 public class TableColumnVisibilityServiceForSecman implements TableColumnVisibilityService {
 
     final MeService meService;
+    final FactoryService factoryService;
     final SpecificationLoader specificationLoader;
 
     @Override
     public boolean hides(Class<?> elementType, String memberId) {
-        val me = meService.me();
+        val me = factoryService.mixin(MeService.me.class, meService).act();
         val permissionSet = me.getPermissionSet();
 
         final boolean granted = specificationLoader.specForType(elementType)