Repository: zest-java Updated Branches: refs/heads/support/2.1 d3a44ed89 -> 3f0633de7
ZEST-127 Fix Servlets assembly DSL for 2.x style usage Cherry-picked from 6b7650a9127a91c871343dce728d54c8d03734b5 Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/3f0633de Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/3f0633de Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/3f0633de Branch: refs/heads/support/2.1 Commit: 3f0633de7c1ce811de43fe94703b125faa235176 Parents: d3a44ed Author: Paul Merlin <[email protected]> Authored: Tue Sep 29 16:59:54 2015 +0200 Committer: Paul Merlin <[email protected]> Committed: Tue Sep 29 17:03:15 2015 +0200 ---------------------------------------------------------------------- .../java/org/qi4j/library/http/Servlets.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/3f0633de/libraries/http/src/main/java/org/qi4j/library/http/Servlets.java ---------------------------------------------------------------------- diff --git a/libraries/http/src/main/java/org/qi4j/library/http/Servlets.java b/libraries/http/src/main/java/org/qi4j/library/http/Servlets.java index 9b4bb28..00c8399 100644 --- a/libraries/http/src/main/java/org/qi4j/library/http/Servlets.java +++ b/libraries/http/src/main/java/org/qi4j/library/http/Servlets.java @@ -26,7 +26,6 @@ import javax.servlet.DispatcherType; import javax.servlet.Filter; import javax.servlet.Servlet; import javax.servlet.ServletContextListener; -import org.qi4j.api.service.ServiceComposite; import org.qi4j.bootstrap.AssemblyException; import org.qi4j.bootstrap.ModuleAssembly; import org.qi4j.library.http.ConstraintInfo.Constraint; @@ -77,17 +76,17 @@ public final class Servlets public static class ContextListenerDeclaration { - Class<? extends ServiceComposite> contextListener; + Class<? extends ServletContextListener> contextListener; Map<String, String> initParams = Collections.emptyMap(); - public <T extends ServletContextListener & ServiceComposite> ContextListenerDeclaration with( Class<T> contextListener ) + public <T extends ServletContextListener> ContextListenerDeclaration with( Class<T> contextListener ) { this.contextListener = contextListener; return this; } - public Class<? extends ServiceComposite> contextListener() + public Class<? extends ServletContextListener> contextListener() { return contextListener; } @@ -142,7 +141,7 @@ public final class Servlets String path; - Class<? extends ServiceComposite> servlet; + Class<? extends Servlet> servlet; Map<String, String> initParams = Collections.emptyMap(); @@ -151,7 +150,7 @@ public final class Servlets this.path = path; } - public <T extends Servlet & ServiceComposite> ServletDeclaration with( Class<T> servlet ) + public <T extends Servlet> ServletDeclaration with( Class<T> servlet ) { this.servlet = servlet; return this; @@ -163,7 +162,7 @@ public final class Servlets return this; } - Class<? extends ServiceComposite> servlet() + Class<? extends Servlet> servlet() { return servlet; } @@ -213,7 +212,7 @@ public final class Servlets String path; - Class<? extends ServiceComposite> filter; + Class<? extends Filter> filter; EnumSet<DispatcherType> dispatchers; @@ -224,7 +223,7 @@ public final class Servlets this.path = path; } - public <T extends Filter & ServiceComposite> FilterAssembler through( + public <T extends Filter> FilterAssembler through( Class<T> filter ) { this.filter = filter; @@ -261,7 +260,7 @@ public final class Servlets return this; } - Class<? extends ServiceComposite> filter() + Class<? extends Filter> filter() { return filter; }
