Refactor: remove EventService; use Spring for events

Author: LEDfan

src/main/java/eu/openanalytics/containerproxy/auth/UserLogoutHandler.java

@@ -24,8 +24,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import eu.openanalytics.containerproxy.event.UserLogoutEvent;
-import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.web.authentication.logout.LogoutHandler;
 import org.springframework.stereotype.Component;

src/main/java/eu/openanalytics/containerproxy/auth/impl/KerberosAuthenticationBackend.java

@@ -27,6 +27,8 @@
 
 import javax.inject.Inject;
 
+import eu.openanalytics.containerproxy.event.UserLogoutEvent;
+import org.springframework.context.event.EventListener;
 import org.springframework.core.env.Environment;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.security.authentication.AuthenticationManager;
@@ -52,25 +54,22 @@
 import eu.openanalytics.containerproxy.auth.impl.kerberos.KRBClientCacheRegistry;
 import eu.openanalytics.containerproxy.auth.impl.kerberos.KRBTicketRenewalManager;
 import eu.openanalytics.containerproxy.model.spec.ContainerSpec;
-import eu.openanalytics.containerproxy.service.EventService;
-import eu.openanalytics.containerproxy.service.EventService.EventType;
 
 public class KerberosAuthenticationBackend implements IAuthenticationBackend {
 
 	public static final String NAME = "kerberos";
 
 	private KRBClientCacheRegistry ccacheReg;
-	
+
+	private KRBTicketRenewalManager renewalManager;
+
 	@Inject
 	Environment environment;
 
 	@Lazy
 	@Inject
 	AuthenticationManager authenticationManager;
 
-	@Inject
-	EventService eventService;
-	
 	@Override
 	public String getName() {
 		return NAME;
@@ -116,13 +115,9 @@ public void configureAuthenticationManagerBuilder(AuthenticationManagerBuilder a
 		ticketValidator.setDebug(true);
 		ticketValidator.afterPropertiesSet();
 
-		KRBTicketRenewalManager renewalManager = new KRBTicketRenewalManager(
+		renewalManager = new KRBTicketRenewalManager(
 				delegSvcPrinc, delegSvcKeytab, backendPrincipals, ccacheReg, ticketRenewInterval);
 
-		eventService.addListener(e -> {
-			if (EventType.Logout.toString().equals(e.type)) renewalManager.stop(e.user);
-		});
-		
 		KerberosServiceAuthenticationProvider authProvider = new KerberosServiceAuthenticationProvider() {
 			@Override
 			public Authentication authenticate(Authentication authentication) throws AuthenticationException {
@@ -138,6 +133,11 @@ public Authentication authenticate(Authentication authentication) throws Authent
 		auth.authenticationProvider(authProvider);
 	}
 
+	@EventListener
+	public void on(UserLogoutEvent event) {
+		renewalManager.stop(event.getUserId());
+	}
+
 	@Override
 	public void customizeContainer(ContainerSpec spec) {
 		String principal = getCurrentPrincipal();

src/main/java/eu/openanalytics/containerproxy/service/EventService.java

@@ -52,7 +52,6 @@
 import eu.openanalytics.containerproxy.model.runtime.ProxyStatus;
 import eu.openanalytics.containerproxy.model.runtime.RuntimeSetting;
 import eu.openanalytics.containerproxy.model.spec.ProxySpec;
-import eu.openanalytics.containerproxy.service.EventService.EventType;
 import eu.openanalytics.containerproxy.spec.IProxySpecMergeStrategy;
 import eu.openanalytics.containerproxy.spec.IProxySpecProvider;
 import eu.openanalytics.containerproxy.spec.ProxySpecException;
@@ -92,9 +91,6 @@ public class ProxyService {
 	@Inject
 	private UserService userService;
 
-	@Inject
-	private EventService eventService;
-	
 	@Inject
 	private LogService logService;
 
@@ -249,8 +245,6 @@ public Proxy startProxy(ProxySpec spec, boolean ignoreAccessControl) throws Cont
 		}
 
 		log.info(String.format("Proxy activated [user: %s] [spec: %s] [id: %s]", proxy.getUserId(), spec.getId(), proxy.getId()));
-		eventService.post(EventType.ProxyStart.toString(), proxy.getUserId(), spec.getId());
-
 		applicationEventPublisher.publishEvent(new ProxyStartEvent(this, proxy.getUserId(), spec.getId(), Duration.ofMillis(proxy.getStartupTimestamp() - proxy.getCreatedTimestamp())));
 
 		return proxy;
@@ -275,8 +269,6 @@ public void stopProxy(Proxy proxy, boolean async, boolean ignoreAccessControl) {
 				backend.stopProxy(proxy);
 				logService.detach(proxy);
 				log.info(String.format("Proxy released [user: %s] [spec: %s] [id: %s]", proxy.getUserId(), proxy.getSpec().getId(), proxy.getId()));
-				eventService.post(EventType.ProxyStop.toString(), proxy.getUserId(), proxy.getSpec().getId());
-
 				applicationEventPublisher.publishEvent(new ProxyStopEvent(this, proxy.getUserId(),
 						proxy.getSpec().getId(),
 						Duration.ofMillis(System.currentTimeMillis() - proxy.getStartupTimestamp())));

src/main/java/eu/openanalytics/containerproxy/service/ProxyService.java

@@ -60,22 +60,18 @@
 import eu.openanalytics.containerproxy.backend.strategy.IProxyLogoutStrategy;
 import eu.openanalytics.containerproxy.model.runtime.Proxy;
 import eu.openanalytics.containerproxy.model.spec.ProxySpec;
-import eu.openanalytics.containerproxy.service.EventService.EventType;
 import eu.openanalytics.containerproxy.util.SessionHelper;
 import org.springframework.web.context.request.RequestContextHolder;
 
 
 @Service
-public class UserService implements ApplicationListener<AbstractAuthenticationEvent> {
+public class UserService {
 
 	private Logger log = LogManager.getLogger(UserService.class);
 
 	@Inject
 	private Environment environment;
 
-	@Inject
-	private EventService eventService;
-	
 	@Inject
 	@Lazy
 	// Note: lazy needed to work around early initialization conflict 
@@ -181,27 +177,25 @@ private String getUserId(Authentication auth) {
 		}
 		return auth.getName();
 	}
-	
-	@Override
-	public void onApplicationEvent(AbstractAuthenticationEvent event) {
+
+	@EventListener
+	public void onAbstractAuthenticationFailureEvent(AbstractAuthenticationFailureEvent event) {
 		Authentication source = event.getAuthentication();
-		if (event instanceof AbstractAuthenticationFailureEvent) {
-			Exception e = ((AbstractAuthenticationFailureEvent) event).getException();
-			log.info(String.format("Authentication failure [user: %s] [error: %s]", source.getName(), e.getMessage()));
-			String userId = getUserId(source);
-			applicationEventPublisher.publishEvent(new AuthFailedEvent(
-					this,
-					userId,
-					RequestContextHolder.currentRequestAttributes().getSessionId()));
-		}
+		Exception e = event.getException();
+		log.info(String.format("Authentication failure [user: %s] [error: %s]", source.getName(), e.getMessage()));
+		String userId = getUserId(source);
+
+		applicationEventPublisher.publishEvent(new AuthFailedEvent(
+				this,
+				userId,
+				RequestContextHolder.currentRequestAttributes().getSessionId()));
 	}
 
 	public void logout(Authentication auth) {
 		// TODO test for anonymous users
 		String userId = getUserId(auth);
 		if (userId == null) return;
 
-		eventService.post(EventType.Logout.toString(), userId, null);
 		if (logoutStrategy != null) logoutStrategy.onLogout(userId);
 		log.info(String.format("User logged out [user: %s]", userId));
 
@@ -219,7 +213,6 @@ public void onAuthenticationSuccessEvent(AuthenticationSuccessEvent event) {
 		String userName = auth.getName();
 
 		log.info(String.format("User logged in [user: %s]", userName));
-		eventService.post(EventType.Login.toString(), userName, null);
 
 		// TODO test for anonymous users
 		String userId = getUserId(auth);

src/main/java/eu/openanalytics/containerproxy/service/UserService.java

@@ -20,14 +20,35 @@
  */
 package eu.openanalytics.containerproxy.stat;
 
+import eu.openanalytics.containerproxy.event.*;
+import org.springframework.context.event.EventListener;
+
 import java.io.IOException;
 
-import org.springframework.core.env.Environment;
+public interface IStatCollector {
 
-import eu.openanalytics.containerproxy.service.EventService.Event;
+    @EventListener
+    default public void onUserLogoutEvent(UserLogoutEvent event) throws IOException {
+    }
 
-public interface IStatCollector {
+    @EventListener
+    default public void onUserLoginEvent(UserLoginEvent event) throws IOException {
+    }
+
+    @EventListener
+    default public void onProxyStartEvent(ProxyStartEvent event) throws IOException {
+    }
+
+    @EventListener
+    default public void onProxyStopEvent(ProxyStopEvent event) throws IOException {
+    }
+
+    @EventListener
+    default public void onProxyStartFailedEvent(ProxyStartFailedEvent event) throws IOException {
+    }
 
-	public void accept(Event event, Environment env) throws IOException;
+    @EventListener
+    default public void onAuthFailedEvent(AuthFailedEvent event) throws IOException {
+    }
 
 }