Skip to content
Snippets Groups Projects
Commit 78d64ce1 authored by Mike McKay's avatar Mike McKay
Browse files

Made some of my dependencies injected.

parent cf9d1019
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 59 additions and 26 deletions
src/main/java/org/nrg/xnat/configuration/SchedulerConfig.java
+ 9
− 6
View file @ 78d64ce1
...@@ -91,12 +91,12 @@ public class SchedulerConfig implements SchedulingConfigurer { ...@@ -91,12 +91,12 @@ public class SchedulerConfig implements SchedulingConfigurer {
// taskRegistrar.addTriggerTask(resetEmailRequests()); // taskRegistrar.addTriggerTask(resetEmailRequests());
// taskRegistrar.addTriggerTask(clearExpiredAliasTokens()); // taskRegistrar.addTriggerTask(clearExpiredAliasTokens());
// taskRegistrar.addTriggerTask(rebuildSessionXmls()); // taskRegistrar.addTriggerTask(rebuildSessionXmls());
XDAT.getContextService().getBean(NrgEventService.class).triggerEvent(new PreferenceEvent("aliasTokenTimeout", String.valueOf(XDAT.getSiteConfigPreferences().getAliasTokenTimeout()))); _eventService.triggerEvent(new PreferenceEvent("aliasTokenTimeout", String.valueOf(XDAT.getSiteConfigPreferences().getAliasTokenTimeout())));
XDAT.getContextService().getBean(NrgEventService.class).triggerEvent(new PreferenceEvent("inactivityBeforeLockout", String.valueOf(XDAT.getSiteConfigPreferences().getInactivityBeforeLockout()))); _eventService.triggerEvent(new PreferenceEvent("inactivityBeforeLockout", String.valueOf(XDAT.getSiteConfigPreferences().getInactivityBeforeLockout())));
XDAT.getContextService().getBean(NrgEventService.class).triggerEvent(new PreferenceEvent("maxFailedLoginsLockoutDuration", String.valueOf(XDAT.getSiteConfigPreferences().getMaxFailedLoginsLockoutDuration()))); _eventService.triggerEvent(new PreferenceEvent("maxFailedLoginsLockoutDuration", String.valueOf(XDAT.getSiteConfigPreferences().getMaxFailedLoginsLockoutDuration())));
XDAT.getContextService().getBean(NrgEventService.class).triggerEvent(new PreferenceEvent("emailPrefix", String.valueOf(XDAT.getNotificationsPreferences().getEmailPrefix()))); _eventService.triggerEvent(new PreferenceEvent("emailPrefix", String.valueOf(XDAT.getNotificationsPreferences().getEmailPrefix())));
XDAT.getContextService().getBean(NrgEventService.class).triggerEvent(new PreferenceEvent("host", String.valueOf(XDAT.getNotificationsPreferences().getHostname()))); _eventService.triggerEvent(new PreferenceEvent("host", String.valueOf(XDAT.getNotificationsPreferences().getHostname())));
XDAT.getContextService().getBean(NrgEventService.class).triggerEvent(new PreferenceEvent("requireLogin", String.valueOf(XDAT.getSiteConfigPreferences().getRequireLogin()))); _eventService.triggerEvent(new PreferenceEvent("requireLogin", String.valueOf(XDAT.getSiteConfigPreferences().getRequireLogin())));
for (final TriggerTask triggerTask : _triggerTasks) { for (final TriggerTask triggerTask : _triggerTasks) {
taskRegistrar.addTriggerTask(triggerTask); taskRegistrar.addTriggerTask(triggerTask);
} }
...@@ -121,4 +121,7 @@ public class SchedulerConfig implements SchedulingConfigurer { ...@@ -121,4 +121,7 @@ public class SchedulerConfig implements SchedulingConfigurer {
@SuppressWarnings("MismatchedQueryAndUpdateOfCollection") @SuppressWarnings("MismatchedQueryAndUpdateOfCollection")
@Inject @Inject
private List<TriggerTask> _triggerTasks; private List<TriggerTask> _triggerTasks;
@Inject
private NrgEventService _eventService;
} }
\ No newline at end of file
src/main/java/org/nrg/xnat/event/listeners/methods/AliasTokenPreferenceHandlerMethod.java
+ 8
− 3
View file @ 78d64ce1
...@@ -6,6 +6,7 @@ import org.nrg.xnat.security.alias.ClearExpiredAliasTokens; ...@@ -6,6 +6,7 @@ import org.nrg.xnat.security.alias.ClearExpiredAliasTokens;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
...@@ -38,14 +39,14 @@ public class AliasTokenPreferenceHandlerMethod extends AbstractSiteConfigPrefere ...@@ -38,14 +39,14 @@ public class AliasTokenPreferenceHandlerMethod extends AbstractSiteConfigPrefere
private void updateAliasTokenTimeout(){ private void updateAliasTokenTimeout(){
try { try {
XDAT.getContextService().getBeansOfType(ThreadPoolTaskScheduler.class).get("taskScheduler").getScheduledThreadPoolExecutor().setRemoveOnCancelPolicy(true); _scheduler.getScheduledThreadPoolExecutor().setRemoveOnCancelPolicy(true);
Iterator<Runnable> iter = XDAT.getContextService().getBeansOfType(ThreadPoolTaskScheduler.class).get("taskScheduler").getScheduledThreadPoolExecutor().getQueue().iterator(); Iterator<Runnable> iter = _scheduler.getScheduledThreadPoolExecutor().getQueue().iterator();
for(ScheduledFuture temp: scheduledAliasTokenTimeouts){ for(ScheduledFuture temp: scheduledAliasTokenTimeouts){
temp.cancel(false); temp.cancel(false);
} }
scheduledAliasTokenTimeouts.add(XDAT.getContextService().getBeansOfType(ThreadPoolTaskScheduler.class).get("taskScheduler").schedule(new ClearExpiredAliasTokens(_template), new CronTrigger(XDAT.getSiteConfigPreferences().getAliasTokenTimeoutSchedule()))); scheduledAliasTokenTimeouts.add(_scheduler.schedule(new ClearExpiredAliasTokens(_template), new CronTrigger(XDAT.getSiteConfigPreferences().getAliasTokenTimeoutSchedule())));
} catch (Exception e1) { } catch (Exception e1) {
_log.error("", e1); _log.error("", e1);
...@@ -60,4 +61,8 @@ public class AliasTokenPreferenceHandlerMethod extends AbstractSiteConfigPrefere ...@@ -60,4 +61,8 @@ public class AliasTokenPreferenceHandlerMethod extends AbstractSiteConfigPrefere
private JdbcTemplate _template; private JdbcTemplate _template;
private ArrayList<ScheduledFuture> scheduledAliasTokenTimeouts = new ArrayList<>(); private ArrayList<ScheduledFuture> scheduledAliasTokenTimeouts = new ArrayList<>();
@Autowired
@Qualifier("taskScheduler")
private ThreadPoolTaskScheduler _scheduler;
} }
src/main/java/org/nrg/xnat/event/listeners/methods/InactivityBeforeLockoutHandlerMethod.java
+ 8
− 3
View file @ 78d64ce1
...@@ -7,6 +7,7 @@ import org.nrg.xnat.security.DisableInactiveUsers; ...@@ -7,6 +7,7 @@ import org.nrg.xnat.security.DisableInactiveUsers;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
...@@ -39,14 +40,14 @@ public class InactivityBeforeLockoutHandlerMethod extends AbstractSiteConfigPref ...@@ -39,14 +40,14 @@ public class InactivityBeforeLockoutHandlerMethod extends AbstractSiteConfigPref
private void updateInactivityBeforeLockout(){ private void updateInactivityBeforeLockout(){
try { try {
XDAT.getContextService().getBeansOfType(ThreadPoolTaskScheduler.class).get("taskScheduler").getScheduledThreadPoolExecutor().setRemoveOnCancelPolicy(true); _scheduler.getScheduledThreadPoolExecutor().setRemoveOnCancelPolicy(true);
Iterator<Runnable> iter = XDAT.getContextService().getBeansOfType(ThreadPoolTaskScheduler.class).get("taskScheduler").getScheduledThreadPoolExecutor().getQueue().iterator(); Iterator<Runnable> iter = _scheduler.getScheduledThreadPoolExecutor().getQueue().iterator();
for(ScheduledFuture temp: scheduledInactivityBeforeLockout){ for(ScheduledFuture temp: scheduledInactivityBeforeLockout){
temp.cancel(false); temp.cancel(false);
} }
scheduledInactivityBeforeLockout.add(XDAT.getContextService().getBeansOfType(ThreadPoolTaskScheduler.class).get("taskScheduler").schedule(new DisableInactiveUsers((new Long(SiteConfigPreferences.convertPGIntervalToSeconds(XDAT.getSiteConfigPreferences().getInactivityBeforeLockout()))).intValue(),(new Long(SiteConfigPreferences.convertPGIntervalToSeconds(XDAT.getSiteConfigPreferences().getMaxFailedLoginsLockoutDuration()))).intValue()),new CronTrigger(XDAT.getSiteConfigPreferences().getInactivityBeforeLockoutSchedule()))); scheduledInactivityBeforeLockout.add(_scheduler.schedule(new DisableInactiveUsers((new Long(SiteConfigPreferences.convertPGIntervalToSeconds(XDAT.getSiteConfigPreferences().getInactivityBeforeLockout()))).intValue(),(new Long(SiteConfigPreferences.convertPGIntervalToSeconds(XDAT.getSiteConfigPreferences().getMaxFailedLoginsLockoutDuration()))).intValue()),new CronTrigger(XDAT.getSiteConfigPreferences().getInactivityBeforeLockoutSchedule())));
} catch (Exception e1) { } catch (Exception e1) {
_log.error("", e1); _log.error("", e1);
...@@ -61,4 +62,8 @@ public class InactivityBeforeLockoutHandlerMethod extends AbstractSiteConfigPref ...@@ -61,4 +62,8 @@ public class InactivityBeforeLockoutHandlerMethod extends AbstractSiteConfigPref
private JdbcTemplate _template; private JdbcTemplate _template;
private ArrayList<ScheduledFuture> scheduledInactivityBeforeLockout = new ArrayList<>(); private ArrayList<ScheduledFuture> scheduledInactivityBeforeLockout = new ArrayList<>();
@Autowired
@Qualifier("taskScheduler")
private ThreadPoolTaskScheduler _scheduler;
} }
src/main/java/org/nrg/xnat/event/listeners/methods/MailHandlerMethod.java
+ 7
− 2
View file @ 78d64ce1
package org.nrg.xnat.event.listeners.methods; package org.nrg.xnat.event.listeners.methods;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.nrg.notify.renderers.ChannelRenderer;
import org.nrg.notify.renderers.NrgMailChannelRenderer; import org.nrg.notify.renderers.NrgMailChannelRenderer;
import org.nrg.xdat.XDAT; import org.nrg.xdat.XDAT;
import org.slf4j.Logger; import org.slf4j.Logger;
...@@ -10,6 +11,7 @@ import org.springframework.context.annotation.Lazy; ...@@ -10,6 +11,7 @@ import org.springframework.context.annotation.Lazy;
import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.inject.Inject;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
...@@ -38,8 +40,8 @@ public class MailHandlerMethod extends AbstractSiteConfigNotificationsPreference ...@@ -38,8 +40,8 @@ public class MailHandlerMethod extends AbstractSiteConfigNotificationsPreference
private void updateMail(){ private void updateMail(){
try { try {
XDAT.getContextService().getBean(NrgMailChannelRenderer.class).setFromAddress(XDAT.getSiteConfigPreferences().getAdminEmail()); ((NrgMailChannelRenderer)_mailRenderer).setFromAddress(XDAT.getSiteConfigPreferences().getAdminEmail());
XDAT.getContextService().getBean(NrgMailChannelRenderer.class).setSubjectPrefix(XDAT.getNotificationsPreferences().getEmailPrefix()); ((NrgMailChannelRenderer)_mailRenderer).setSubjectPrefix(XDAT.getNotificationsPreferences().getEmailPrefix());
} catch (Exception e1) { } catch (Exception e1) {
_log.error("", e1); _log.error("", e1);
...@@ -53,4 +55,7 @@ public class MailHandlerMethod extends AbstractSiteConfigNotificationsPreference ...@@ -53,4 +55,7 @@ public class MailHandlerMethod extends AbstractSiteConfigNotificationsPreference
@Lazy @Lazy
private JdbcTemplate _template; private JdbcTemplate _template;
@Inject
private ChannelRenderer _mailRenderer;
} }
src/main/java/org/nrg/xnat/event/listeners/methods/ResetFailedLoginsHandlerMethod.java
+ 8
− 3
View file @ 78d64ce1
...@@ -6,6 +6,7 @@ import org.nrg.xnat.security.ResetFailedLogins; ...@@ -6,6 +6,7 @@ import org.nrg.xnat.security.ResetFailedLogins;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
...@@ -38,14 +39,14 @@ public class ResetFailedLoginsHandlerMethod extends AbstractSiteConfigPreference ...@@ -38,14 +39,14 @@ public class ResetFailedLoginsHandlerMethod extends AbstractSiteConfigPreference
private void updateResetFailedLogins(){ private void updateResetFailedLogins(){
try { try {
XDAT.getContextService().getBeansOfType(ThreadPoolTaskScheduler.class).get("taskScheduler").getScheduledThreadPoolExecutor().setRemoveOnCancelPolicy(true); _scheduler.getScheduledThreadPoolExecutor().setRemoveOnCancelPolicy(true);
Iterator<Runnable> iter = XDAT.getContextService().getBeansOfType(ThreadPoolTaskScheduler.class).get("taskScheduler").getScheduledThreadPoolExecutor().getQueue().iterator(); _scheduler.getScheduledThreadPoolExecutor().getQueue().iterator();
for(ScheduledFuture temp: scheduledResetFailedLogins){ for(ScheduledFuture temp: scheduledResetFailedLogins){
temp.cancel(false); temp.cancel(false);
} }
scheduledResetFailedLogins.add(XDAT.getContextService().getBeansOfType(ThreadPoolTaskScheduler.class).get("taskScheduler").schedule(new ResetFailedLogins(_template,XDAT.getSiteConfigPreferences().getMaxFailedLoginsLockoutDuration()),new CronTrigger(XDAT.getSiteConfigPreferences().getResetFailedLoginsSchedule()))); scheduledResetFailedLogins.add(_scheduler.schedule(new ResetFailedLogins(_template,XDAT.getSiteConfigPreferences().getMaxFailedLoginsLockoutDuration()),new CronTrigger(XDAT.getSiteConfigPreferences().getResetFailedLoginsSchedule())));
} catch (Exception e1) { } catch (Exception e1) {
_log.error("", e1); _log.error("", e1);
...@@ -60,4 +61,8 @@ public class ResetFailedLoginsHandlerMethod extends AbstractSiteConfigPreference ...@@ -60,4 +61,8 @@ public class ResetFailedLoginsHandlerMethod extends AbstractSiteConfigPreference
private JdbcTemplate _template; private JdbcTemplate _template;
private ArrayList<ScheduledFuture> scheduledResetFailedLogins = new ArrayList<>(); private ArrayList<ScheduledFuture> scheduledResetFailedLogins = new ArrayList<>();
@Autowired
@Qualifier("taskScheduler")
private ThreadPoolTaskScheduler _scheduler;
} }
src/main/java/org/nrg/xnat/event/listeners/methods/SmtpHandlerMethod.java
+ 9
− 5
View file @ 78d64ce1
...@@ -10,6 +10,7 @@ import org.springframework.jdbc.core.JdbcTemplate; ...@@ -10,6 +10,7 @@ import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.mail.javamail.JavaMailSenderImpl; import org.springframework.mail.javamail.JavaMailSenderImpl;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.inject.Inject;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
...@@ -38,11 +39,11 @@ public class SmtpHandlerMethod extends AbstractNotificationsPreferenceHandlerMet ...@@ -38,11 +39,11 @@ public class SmtpHandlerMethod extends AbstractNotificationsPreferenceHandlerMet
private void updateSmtp(){ private void updateSmtp(){
try { try {
XDAT.getContextService().getBean(JavaMailSenderImpl.class).setHost(XDAT.getNotificationsPreferences().getHostname()); _mailSender.setHost(XDAT.getNotificationsPreferences().getHostname());
XDAT.getContextService().getBean(JavaMailSenderImpl.class).setPort(XDAT.getNotificationsPreferences().getPort()); _mailSender.setPort(XDAT.getNotificationsPreferences().getPort());
XDAT.getContextService().getBean(JavaMailSenderImpl.class).setUsername(XDAT.getNotificationsPreferences().getUsername()); _mailSender.setUsername(XDAT.getNotificationsPreferences().getUsername());
XDAT.getContextService().getBean(JavaMailSenderImpl.class).setPassword(XDAT.getNotificationsPreferences().getPassword()); _mailSender.setPassword(XDAT.getNotificationsPreferences().getPassword());
XDAT.getContextService().getBean(JavaMailSenderImpl.class).setProtocol(XDAT.getNotificationsPreferences().getProtocol()); _mailSender.setProtocol(XDAT.getNotificationsPreferences().getProtocol());
} catch (Exception e1) { } catch (Exception e1) {
_log.error("", e1); _log.error("", e1);
...@@ -56,4 +57,7 @@ public class SmtpHandlerMethod extends AbstractNotificationsPreferenceHandlerMet ...@@ -56,4 +57,7 @@ public class SmtpHandlerMethod extends AbstractNotificationsPreferenceHandlerMet
@Lazy @Lazy
private JdbcTemplate _template; private JdbcTemplate _template;
@Inject
private JavaMailSenderImpl _mailSender;
} }
src/main/java/org/nrg/xnat/event/listeners/methods/UpdateSecurityFilterHandlerMethod.java
+ 10
− 4
View file @ 78d64ce1
...@@ -11,6 +11,7 @@ import org.springframework.jdbc.core.JdbcTemplate; ...@@ -11,6 +11,7 @@ import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.security.web.access.intercept.FilterSecurityInterceptor; import org.springframework.security.web.access.intercept.FilterSecurityInterceptor;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.inject.Inject;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
...@@ -38,10 +39,8 @@ public class UpdateSecurityFilterHandlerMethod extends AbstractSiteConfigPrefere ...@@ -38,10 +39,8 @@ public class UpdateSecurityFilterHandlerMethod extends AbstractSiteConfigPrefere
} }
private void updateSecurityFilter(){ private void updateSecurityFilter(){
FilterSecurityInterceptor interceptor = XDAT.getContextService().getBean(FilterSecurityInterceptor.class); if(_interceptor!=null && _postProcessor!=null){
FilterSecurityInterceptorBeanPostProcessor postProcessor = XDAT.getContextService().getBean(FilterSecurityInterceptorBeanPostProcessor.class); _interceptor.setSecurityMetadataSource(_postProcessor.getMetadataSource(XDAT.getSiteConfigPreferences().getRequireLogin()));
if(interceptor!=null && postProcessor!=null){
interceptor.setSecurityMetadataSource(postProcessor.getMetadataSource(XDAT.getSiteConfigPreferences().getRequireLogin()));
} }
} }
...@@ -51,4 +50,11 @@ public class UpdateSecurityFilterHandlerMethod extends AbstractSiteConfigPrefere ...@@ -51,4 +50,11 @@ public class UpdateSecurityFilterHandlerMethod extends AbstractSiteConfigPrefere
@Autowired @Autowired
@Lazy @Lazy
private JdbcTemplate _template; private JdbcTemplate _template;
@Inject
private FilterSecurityInterceptor _interceptor;
@Inject
private FilterSecurityInterceptorBeanPostProcessor _postProcessor;
} }
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment