From 0436de6184c1a95d463da52929e3bf60923d6e04 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Mon, 13 Dec 2021 09:23:09 +0100
Subject: update third-party libs and resolve API issues

---
 .../id/configuration/utils/UserRequestCleaner.java | 110 ++++++++++-----------
 1 file changed, 54 insertions(+), 56 deletions(-)

(limited to 'id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/utils/UserRequestCleaner.java')

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/utils/UserRequestCleaner.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/utils/UserRequestCleaner.java
index 5f55a61d5..a78de7362 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/utils/UserRequestCleaner.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/utils/UserRequestCleaner.java
@@ -26,68 +26,66 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
-import org.apache.log4j.Logger;
-
 import at.gv.egovernment.moa.id.commons.db.dao.config.UserDatabase;
 import at.gv.egovernment.moa.id.config.webgui.exception.ConfigurationException;
 import at.gv.egovernment.moa.id.configuration.auth.AuthenticationManager;
 import at.gv.egovernment.moa.id.configuration.config.ConfigurationProvider;
 import at.gv.egovernment.moa.id.configuration.helper.DateTimeHelper;
+import lombok.extern.slf4j.Slf4j;
 
-
+@Slf4j
 public class UserRequestCleaner implements Runnable {
 
-	private static final Logger log = Logger.getLogger(UserRequestCleaner.class);
-	
-	private static final long SESSION_CLEANUP_INTERVAL = 5 * 60; // 5 min
-		
-	public void run() {
-		 while (true) {
-			 try {
-				ConfigurationProvider config = ConfigurationProvider.getInstance();
-				
-				//clean up user request storage
-				List<UserDatabase> userrequests = config.getUserManagement().getAllOpenUsersRequests();
-				if (userrequests != null) {
-					Calendar cal = Calendar.getInstance();
-					cal.add(Calendar.HOUR, config.getUserRequestCleanUpDelay()*-1);
-					Date cleanupdate = cal.getTime();
-					
-					for(UserDatabase dbuser : userrequests) {
-						Date requestdate = DateTimeHelper.parseDateTime(dbuser.getLastLogin());
-
-						if (requestdate != null && requestdate.after(cleanupdate)) {
-							log.info("Remove UserRequest from Database");
-							config.getUserManagement().delete(dbuser);
-						}
-					
-					}					
-				}
-				
-				//clean up active user storage
-				AuthenticationManager.getInstance().removeAllUsersAfterTimeOut();
-								
-				Thread.sleep(SESSION_CLEANUP_INTERVAL * 1000);
-				
-			} catch (ConfigurationException e) {
-				log.info("UserRequestCleaner can not load configuration", e);
-				
-			} catch (InterruptedException e) {
-				
-			} 
-		 }
-	}
-	
-	  /**
-	   * start the sessionCleaner
-	   */
-	  public static void start() {
-	    // start the session cleanup thread
-	    Thread sessionCleaner = new Thread(new UserRequestCleaner());
-	    sessionCleaner.setName("UserRequestCleaner");
-	    sessionCleaner.setDaemon(true);
-	    sessionCleaner.setPriority(Thread.MIN_PRIORITY);
-	    sessionCleaner.start();
-	  }
-	
+  private static final long SESSION_CLEANUP_INTERVAL = 5 * 60; // 5 min
+
+  @Override
+  public void run() {
+    while (true) {
+      try {
+        final ConfigurationProvider config = ConfigurationProvider.getInstance();
+
+        // clean up user request storage
+        final List<UserDatabase> userrequests = config.getUserManagement().getAllOpenUsersRequests();
+        if (userrequests != null) {
+          final Calendar cal = Calendar.getInstance();
+          cal.add(Calendar.HOUR, config.getUserRequestCleanUpDelay() * -1);
+          final Date cleanupdate = cal.getTime();
+
+          for (final UserDatabase dbuser : userrequests) {
+            final Date requestdate = DateTimeHelper.parseDateTime(dbuser.getLastLogin());
+
+            if (requestdate != null && requestdate.after(cleanupdate)) {
+              log.info("Remove UserRequest from Database");
+              config.getUserManagement().delete(dbuser);
+            }
+
+          }
+        }
+
+        // clean up active user storage
+        AuthenticationManager.getInstance().removeAllUsersAfterTimeOut();
+
+        Thread.sleep(SESSION_CLEANUP_INTERVAL * 1000);
+
+      } catch (final ConfigurationException e) {
+        log.info("UserRequestCleaner can not load configuration", e);
+
+      } catch (final InterruptedException e) {
+
+      }
+    }
+  }
+
+  /**
+   * start the sessionCleaner
+   */
+  public static void start() {
+    // start the session cleanup thread
+    final Thread sessionCleaner = new Thread(new UserRequestCleaner());
+    sessionCleaner.setName("UserRequestCleaner");
+    sessionCleaner.setDaemon(true);
+    sessionCleaner.setPriority(Thread.MIN_PRIORITY);
+    sessionCleaner.start();
+  }
+
 }
-- 
cgit v1.2.3