ISIS-1494: EmailNotificationServiceDefault now uses EmailService (interface) rather than the concrete default impl
Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/d532abc8 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/d532abc8 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/d532abc8 Branch: refs/heads/master Commit: d532abc8c6f576521e683efde40ad5f1a8dcc4e0 Parents: c8f5655 Author: Dan Haywood <[email protected]> Authored: Tue Sep 27 18:15:14 2016 +0100 Committer: Dan Haywood <[email protected]> Committed: Tue Sep 27 18:15:14 2016 +0100 ---------------------------------------------------------------------- .../services/userreg/EmailNotificationServiceDefault.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/d532abc8/core/runtime/src/main/java/org/apache/isis/core/runtime/services/userreg/EmailNotificationServiceDefault.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/userreg/EmailNotificationServiceDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/userreg/EmailNotificationServiceDefault.java index 12fc4b8..679b204 100644 --- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/userreg/EmailNotificationServiceDefault.java +++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/userreg/EmailNotificationServiceDefault.java @@ -23,20 +23,23 @@ import java.net.URL; import java.util.Collections; import java.util.List; import java.util.regex.Pattern; + import javax.annotation.PostConstruct; -import javax.inject.Inject; + import com.google.common.base.Charsets; import com.google.common.io.Resources; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.apache.isis.applib.annotation.DomainService; import org.apache.isis.applib.annotation.NatureOfService; import org.apache.isis.applib.annotation.Programmatic; +import org.apache.isis.applib.services.email.EmailService; import org.apache.isis.applib.services.userreg.EmailNotificationService; import org.apache.isis.applib.services.userreg.events.EmailEventAbstract; import org.apache.isis.applib.services.userreg.events.EmailRegistrationEvent; import org.apache.isis.applib.services.userreg.events.PasswordResetEvent; -import org.apache.isis.core.runtime.services.email.EmailServiceDefault; import static java.util.regex.Pattern.compile; import static java.util.regex.Pattern.quote; @@ -172,7 +175,7 @@ public class EmailNotificationServiceDefault implements EmailNotificationService //region > dependencies @javax.inject.Inject - private EmailServiceDefault emailService; + private EmailService emailService; //endregion }
