MID-7647: removing instance of RemoveUnusedSecurityFilterPublisher fr…

…om MidpointSecurityContext
Evolveum · Mar 9, 2022 · 0d47f45 · 0d47f45
1 parent c269fd0
commit 0d47f45
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/...impl/src/main/java/com/evolveum/midpoint/authentication/impl/MidpointSecurityContext.java b/...impl/src/main/java/com/evolveum/midpoint/authentication/impl/MidpointSecurityContext.java
@@ -20,11 +20,9 @@
 public class MidpointSecurityContext implements SecurityContext {
 
     private final SecurityContext securityContext;
-    private final RemoveUnusedSecurityFilterPublisher publisher;
 
-    public MidpointSecurityContext (SecurityContext securityContext, RemoveUnusedSecurityFilterPublisher publisher) {
+    public MidpointSecurityContext (SecurityContext securityContext) {
         this.securityContext = securityContext;
-        this.publisher = publisher;
     }
 
     @Override
@@ -36,7 +34,7 @@ public Authentication getAuthentication() {
     public void setAuthentication(Authentication authentication) {
         if (getAuthentication() instanceof MidpointAuthentication
                 && !getAuthentication().equals(authentication)) {
-            publisher.publishCustomEvent((MidpointAuthentication) getAuthentication());
+            RemoveUnusedSecurityFilterPublisher.get().publishCustomEvent((MidpointAuthentication) getAuthentication());
         }
         securityContext.setAuthentication(authentication);
     }

diff --git a/...veum/midpoint/authentication/impl/configuration/MidpointWebSecurityConfigurerAdapter.java b/...veum/midpoint/authentication/impl/configuration/MidpointWebSecurityConfigurerAdapter.java
@@ -64,9 +64,6 @@ public class MidpointWebSecurityConfigurerAdapter extends WebSecurityConfigurerA
     @Autowired
     private SessionRegistry sessionRegistry;
 
-    @Autowired
-    private RemoveUnusedSecurityFilterPublisher removeUnusedSecurityFilterPublisher;
-
     private ObjectPostProcessor<Object> objectObjectPostProcessor;
 
     public MidpointWebSecurityConfigurerAdapter() {
@@ -171,7 +168,7 @@ public void saveContext(SecurityContext context, HttpServletRequest request, Htt
 
             @Override
             protected SecurityContext generateNewContext() {
-                return new MidpointSecurityContext(super.generateNewContext(), removeUnusedSecurityFilterPublisher);
+                return new MidpointSecurityContext(super.generateNewContext());
             }
         };
         httpSecurityRepository.setDisableUrlRewriting(true);

diff --git a/...om/evolveum/midpoint/authentication/impl/session/RemoveUnusedSecurityFilterPublisher.java b/...om/evolveum/midpoint/authentication/impl/session/RemoveUnusedSecurityFilterPublisher.java
@@ -15,6 +15,8 @@
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
 
+import javax.annotation.PostConstruct;
+
 /**
  * @author skublik
  */
@@ -27,9 +29,20 @@ public class RemoveUnusedSecurityFilterPublisher {
     @Autowired
     private ApplicationEventPublisher applicationEventPublisher;
 
+    private static RemoveUnusedSecurityFilterPublisher instance;
+
     public void publishCustomEvent(final MidpointAuthentication mpAuthentication) {
         LOGGER.trace("Publishing RemoveUnusedSecurityFilterEvent event. With authentication: " + mpAuthentication);
         RemoveUnusedSecurityFilterEvent customSpringEvent = new RemoveUnusedSecurityFilterEvent(this, mpAuthentication);
         applicationEventPublisher.publishEvent(customSpringEvent);
     }
+
+    @PostConstruct
+    public void afterConstruct(){
+        instance = this;
+    }
+
+    public static RemoveUnusedSecurityFilterPublisher get() {
+        return instance;
+    }
 }