Author: echatellier Date: 2014-08-06 10:46:09 +0200 (Wed, 06 Aug 2014) New Revision: 477 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/477 Log: call specific method to get service when possible Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceContext.java trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/AbstractFaxToMailServiceTest.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/FaxToMailApplicationContext.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/ClientUpdateJob.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/EDIManagementJob.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceContext.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceContext.java 2014-08-06 08:16:34 UTC (rev 476) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailServiceContext.java 2014-08-06 08:46:09 UTC (rev 477) @@ -32,10 +32,12 @@ import java.util.Date; import com.franciaflex.faxtomail.persistence.entities.FaxToMailTopiaApplicationContext; +import com.franciaflex.faxtomail.services.service.ClientService; import com.franciaflex.faxtomail.services.service.ConfigurationService; import com.franciaflex.faxtomail.services.service.ConfigurationServiceImpl; import com.franciaflex.faxtomail.services.service.EmailService; import com.franciaflex.faxtomail.services.service.EmailServiceImpl; +import com.franciaflex.faxtomail.services.service.InitFaxToMailService; import com.franciaflex.faxtomail.services.service.LdapServiceImpl; import com.franciaflex.faxtomail.services.service.MailFolderService; import com.franciaflex.faxtomail.services.service.MailFolderServiceImpl; @@ -45,6 +47,7 @@ import com.franciaflex.faxtomail.services.service.UserServiceImpl; import com.franciaflex.faxtomail.services.service.ValidationService; import com.franciaflex.faxtomail.services.service.ValidationServiceImpl; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.application.ApplicationTechnicalException; @@ -233,7 +236,15 @@ public ConfigurationService getConfigurationService() { return newService(ConfigurationService.class); } + + public InitFaxToMailService getInitFaxToMailService() { + return newService(InitFaxToMailService.class); + } + public ClientService getClientService() { + return newService(ClientService.class); + } + @Override public void close() throws IOException { if (persistenceContext != null) { Modified: trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/AbstractFaxToMailServiceTest.java =================================================================== --- trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/AbstractFaxToMailServiceTest.java 2014-08-06 08:16:34 UTC (rev 476) +++ trunk/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/AbstractFaxToMailServiceTest.java 2014-08-06 08:46:09 UTC (rev 477) @@ -140,7 +140,7 @@ serviceContext.setApplicationConfig(getApplicationConfig()); - InitFaxToMailService initFaxToMailService = serviceContext.newService(InitFaxToMailService.class); + InitFaxToMailService initFaxToMailService = serviceContext.getInitFaxToMailService(); initFaxToMailService.init(); Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-08-06 08:16:34 UTC (rev 476) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java 2014-08-06 08:46:09 UTC (rev 477) @@ -215,11 +215,10 @@ topiaApplicationContext = new FaxToMailTopiaApplicationContext(config.getTopiaProperties()); FaxToMailServiceContext serviceContext = newServiceContext(); - InitFaxToMailService initExtranetService = - serviceContext.newService(InitFaxToMailService.class); + InitFaxToMailService initFaxToMailService = + serviceContext.getInitFaxToMailService(); + initFaxToMailService.init(); - initExtranetService.init(); - Map<Class, State> additionalStates = Maps.newHashMap(); additionalStates.put(BeanFilterableComboBox.class, new BeanFilterableComboBoxState()); additionalStates.put(BeanDoubleList.class, new BeanDoubleListState()); Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/FaxToMailApplicationContext.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/FaxToMailApplicationContext.java 2014-08-06 08:16:34 UTC (rev 476) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/FaxToMailApplicationContext.java 2014-08-06 08:46:09 UTC (rev 477) @@ -152,10 +152,10 @@ FaxToMailServiceContext serviceContext = newServiceContext(persistenceContext); - InitFaxToMailService initExtranetService = - serviceContext.newService(InitFaxToMailService.class); + InitFaxToMailService initFaxToMailService = + serviceContext.getInitFaxToMailService(); - initExtranetService.init(); + initFaxToMailService.init(); persistenceContext.close(); Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java 2014-08-06 08:16:34 UTC (rev 476) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailInterceptor.java 2014-08-06 08:46:09 UTC (rev 477) @@ -144,7 +144,7 @@ protected void populateUser(FaxToMailSession faxToMailSession, FaxToMailServiceContext serviceContext) { if (StringUtils.isNotBlank(faxToMailSession.getAuthenticatedUserId())) { - LdapService ldapService = serviceContext.newService(LdapService.class); + LdapService ldapService = serviceContext.getLdapService(); // return can be null FaxToMailUser user = ldapService.getUserBean(faxToMailSession.getAuthenticatedUserId()); faxToMailSession.setAuthenticatedFaxToMailUser(user); Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/ClientUpdateJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/ClientUpdateJob.java 2014-08-06 08:16:34 UTC (rev 476) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/ClientUpdateJob.java 2014-08-06 08:46:09 UTC (rev 477) @@ -60,7 +60,7 @@ log.debug("Running ClientUpdateJob at " + serviceContext.getNow()); } - ClientService clientService = serviceContext.newService(ClientService.class); + ClientService clientService = serviceContext.getClientService(); clientService.updateNewClients(); if (log.isDebugEnabled()) { Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/EDIManagementJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/EDIManagementJob.java 2014-08-06 08:16:34 UTC (rev 476) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/EDIManagementJob.java 2014-08-06 08:46:09 UTC (rev 477) @@ -58,7 +58,7 @@ log.debug("Running EDIManagementJob at " + serviceContext.getNow()); } - EmailService emailService = serviceContext.newService(EmailService.class); + EmailService emailService = serviceContext.getEmailService(); emailService.transmitPendingDemandsToEdi(); if (log.isDebugEnabled()) { Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-08-06 08:16:34 UTC (rev 476) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-08-06 08:46:09 UTC (rev 477) @@ -144,11 +144,11 @@ log.debug("Running MailFilterJob at " + serviceContext.getNow()); } - emailService = serviceContext.newService(EmailService.class); - mailFolderService = serviceContext.newService(MailFolderService.class); - configurationService = serviceContext.newService(ConfigurationService.class); - clientService = serviceContext.newService(ClientService.class); - decoratorService = serviceContext.newService(DecoratorService.class); + emailService = serviceContext.getEmailService(); + mailFolderService = serviceContext.getMailFolderService(); + configurationService = serviceContext.getConfigurationService(); + clientService = serviceContext.getClientService(); + decoratorService = serviceContext.getDecoratorService(); Collection<EmailAccount> emailAccounts = configurationService.getEmailAccounts();