Make cleanup cron configurable

Author: amontenegro

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

@@ -32,7 +32,5 @@
 
     FlushMode flushMode() default FlushMode.ON_SAVE;
 
-    String cleanupCron() default "0 * * * * *";
-
     SaveMode saveMode() default SaveMode.ON_SET_ATTRIBUTE;
 }

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

@@ -64,8 +64,6 @@
 )
 @Profile("!unitTests")
 public class OrcidRedisHttpSessionConfiguration extends SpringHttpSessionConfiguration implements BeanClassLoaderAware, EmbeddedValueResolverAware, ImportAware {
-
-    static final String DEFAULT_CLEANUP_CRON = "0 * * * * *";
     private Integer maxInactiveIntervalInSeconds = 1800;
     private String redisNamespace = "spring:session";
     private FlushMode flushMode;
@@ -82,10 +80,10 @@ public class OrcidRedisHttpSessionConfiguration extends SpringHttpSessionConfigu
     private ClassLoader classLoader;
     private StringValueResolver embeddedValueResolver;
 
-    public OrcidRedisHttpSessionConfiguration() {
+    public OrcidRedisHttpSessionConfiguration(@Value("${org.orcid.core.utils.cache.session.redis.cleanup.cron:5 */5 * * * *}") String cleanupCron) {
         this.flushMode = FlushMode.ON_SAVE;
         this.saveMode = SaveMode.ON_SET_ATTRIBUTE;
-        this.cleanupCron = "0 * * * * *";
+        this.cleanupCron = cleanupCron;
         this.configureRedisAction = new ConfigureNotifyKeyspaceEventsAction();
     }
 
@@ -163,10 +161,6 @@ public void setSaveMode(SaveMode saveMode) {
         this.saveMode = saveMode;
     }
 
-    public void setCleanupCron(String cleanupCron) {
-        this.cleanupCron = cleanupCron;
-    }
-
     @Autowired(
             required = false
     )
@@ -252,11 +246,6 @@ public void setImportMetadata(AnnotationMetadata importMetadata) {
 
         this.flushMode = flushMode;
         this.saveMode = (SaveMode)attributes.getEnum("saveMode");
-        String cleanupCron = attributes.getString("cleanupCron");
-        if (StringUtils.hasText(cleanupCron)) {
-            this.cleanupCron = cleanupCron;
-        }
-
     }
 
     private RedisTemplate<Object, Object> createRedisTemplate() {

orcid-web/src/main/java/org/orcid/frontend/web/util/SwitchUserGrantedAuthorityDeserializer.java

@@ -22,9 +22,6 @@ public SwitchUserGrantedAuthority deserialize(JsonParser p, DeserializationConte
         String role = authorityNode.asText();
         UsernamePasswordAuthenticationToken authentication = mapper.convertValue(sourceNode, UsernamePasswordAuthenticationToken.class);
 
-        System.out.println(sourceNode.asText());
-        System.out.println(authorityNode.asText());
-
         return new SwitchUserGrantedAuthority(role, authentication);
     }
 }