Change some logs to trace

Author: amontenegro

orcid-web/src/main/java/org/orcid/frontend/spring/session/redis/OrcidEnableRedisHttpSession.java

@@ -9,6 +9,17 @@
 
 import java.lang.annotation.*;
 
+/**
+ * This code is an adaptation from the original Spring Session Data Redis (https://spring.io/projects/spring-session,
+ * source code https://github.com/spring-projects/spring-session/tree/main/spring-session-data-redis)
+ * And has been modified to meet ORCID requirements.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ * */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE})
 @Documented

orcid-web/src/main/java/org/orcid/frontend/spring/session/redis/OrcidRedisHttpSessionConfiguration.java

@@ -54,6 +54,17 @@
 import java.util.concurrent.Executor;
 import java.util.stream.Collectors;
 
+/**
+ * This code is an adaptation from the original Spring Session Data Redis (https://spring.io/projects/spring-session,
+ * source code https://github.com/spring-projects/spring-session/tree/main/spring-session-data-redis)
+ * And has been modified to meet ORCID requirements.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ * */
 @Configuration(
         proxyBeanMethods = false
 )

orcid-web/src/main/java/org/orcid/frontend/spring/session/redis/OrcidRedisIndexedSessionRepository.java

@@ -29,6 +29,17 @@
 import java.time.Instant;
 import java.util.*;
 
+/**
+ * This code is an adaptation from the original Spring Session Data Redis (https://spring.io/projects/spring-session,
+ * source code https://github.com/spring-projects/spring-session/tree/main/spring-session-data-redis)
+ * And has been modified to meet ORCID requirements.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ * */
 public class OrcidRedisIndexedSessionRepository implements FindByIndexNameSessionRepository<OrcidRedisIndexedSessionRepository.RedisSession>, MessageListener {
     private static final Log logger = LogFactory.getLog(OrcidRedisIndexedSessionRepository.class);
     private static final String SPRING_SECURITY_CONTEXT = "SPRING_SECURITY_CONTEXT";
@@ -127,13 +138,10 @@ public RedisOperations<Object, Object> getSessionRedisOperations() {
     }
 
     public void save(OrcidRedisIndexedSessionRepository.RedisSession session) {
-        // TODO: REMOVE ALL THIS BEFORE GOING LIVE!!!
         ServletRequestAttributes att = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
         HttpServletRequest request = att.getRequest();
-        ///////////////////////////////////////////////
 
         if(updateSession()) {
-            //TODO: REMOVE THIS LOG ENTRY BEFORE GOING LIVE!!!!
             logger.debug("Saving session for " + request.getRequestURI() + " - " + request.getMethod());
             session.save();
             if (session.isNew) {
@@ -142,8 +150,7 @@ public void save(OrcidRedisIndexedSessionRepository.RedisSession session) {
                 session.isNew = false;
             }
         } else {
-            //TODO: REMOVE THIS LOG ENTRY BEFORE GOING LIVE!!!!
-            logger.debug("Skip save session id " + request.getRequestURI() + " - " + request.getMethod());
+            logger.trace("Skip save session id " + request.getRequestURI() + " - " + request.getMethod());
         }
     }
 
@@ -204,17 +211,13 @@ private MapSession loadSession(String id, Map<Object, Object> entries) {
             } else if ("maxInactiveInterval".equals(key)) {
                 loaded.setMaxInactiveInterval(Duration.ofSeconds((long)(Integer)entry.getValue()));
             } else if ("lastAccessedTime".equals(key)) {
-                // TODO: REMOVE ALL THIS BEFORE GOING LIVE!!!
                 ServletRequestAttributes att = (ServletRequestAttributes)RequestContextHolder.getRequestAttributes();
                 HttpServletRequest request = att.getRequest();
-                ///////////////////////////////////////////////
                 if(updateSession()) {
-                    // TODO: REMOVE THIS LOG ENTRY BEFORE GOING LIVE!!!
                     logger.debug("Updating last accessed time for " + request.getRequestURI() + " - " + request.getMethod());
                     loaded.setLastAccessedTime(Instant.ofEpochMilli((Long) entry.getValue()));
                 } else {
-                    // TODO: REMOVE THIS LOG ENTRY BEFORE GOING LIVE!!!
-                    logger.debug("Ignoring last accessed time for " + request.getRequestURI() + " - " + request.getMethod());
+                    logger.trace("Ignoring last accessed time for " + request.getRequestURI() + " - " + request.getMethod());
                 }
             } else if (key.startsWith("sessionAttr:")) {
                 loaded.setAttribute(key.substring("sessionAttr:".length()), entry.getValue());
@@ -417,15 +420,16 @@ final class RedisSession implements Session {
 
         public void setLastAccessedTime(Instant lastAccessedTime) {
             if(updateSession()) {
-                // TODO: REMOVE THIS BEFORE GOING LIVE!!!!
                 ServletRequestAttributes att = (ServletRequestAttributes)RequestContextHolder.getRequestAttributes();
                 HttpServletRequest request = att.getRequest();
-                logger.debug("REDIS_SESSION: setLastAccessedTime: " + request.getRequestURI().toString() + " - " + request.getMethod());
-                ///////////////////////////////////////////
-
+                logger.debug("Set last accessed time for REDIS_SESSION: " + request.getRequestURI().toString() + " - " + request.getMethod());
                 this.cached.setLastAccessedTime(lastAccessedTime);
                 this.delta.put("lastAccessedTime", this.getLastAccessedTime().toEpochMilli());
                 this.flushImmediateIfNecessary();
+            } else {
+                ServletRequestAttributes att = (ServletRequestAttributes)RequestContextHolder.getRequestAttributes();
+                HttpServletRequest request = att.getRequest();
+                logger.trace("Set last accessed time for REDIS_SESSION: " + request.getRequestURI().toString() + " - " + request.getMethod());
             }
         }
 

orcid-web/src/main/java/org/orcid/frontend/spring/session/redis/OrcidRedisSessionExpirationPolicy.java

@@ -13,6 +13,17 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 
+/**
+ * This code is an adaptation from the original Spring Session Data Redis (https://spring.io/projects/spring-session,
+ * source code https://github.com/spring-projects/spring-session/tree/main/spring-session-data-redis)
+ * And has been modified to meet ORCID requirements.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ * */
 public class OrcidRedisSessionExpirationPolicy {
     private static final Log logger = LogFactory.getLog(OrcidRedisSessionExpirationPolicy.class);
     private static final String SESSION_EXPIRES_PREFIX = "expires:";