From 1f76fd53605196dea3f1252691b0438b78a2afc3 Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Thu, 21 Mar 2013 15:47:10 +0100 Subject: [PATCH] Now WSF_FILTER_HANDLER is a handler and has formal generic G constrained to WSF_HANDLER This eases implementation of potential descendants. --- .../server/wsf/router/filter/wsf_filter_handler.e | 6 +++--- .../helpers/wsf_starts_with_filter_handler.e | 12 ++---------- .../support/uri/helpers/wsf_uri_filter_handler.e | 12 ++---------- .../helpers/wsf_uri_template_filter_handler.e | 12 ++---------- .../wsf/router_context/wsf_filter_context_handler.e | 12 ++---------- 5 files changed, 11 insertions(+), 43 deletions(-) diff --git a/library/server/wsf/router/filter/wsf_filter_handler.e b/library/server/wsf/router/filter/wsf_filter_handler.e index 7fc63ca1..0fa0ccbb 100644 --- a/library/server/wsf/router/filter/wsf_filter_handler.e +++ b/library/server/wsf/router/filter/wsf_filter_handler.e @@ -8,14 +8,14 @@ note revision: "$Revision$" deferred class - WSF_FILTER_HANDLER + WSF_FILTER_HANDLER [G -> WSF_HANDLER] inherit WSF_HANDLER feature -- Access - next: detachable WSF_HANDLER + next: detachable G -- Next handler feature -- Element change @@ -29,7 +29,7 @@ feature -- Element change end note - copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others" + copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others" license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)" source: "[ Eiffel Software diff --git a/library/server/wsf/router/support/starts_with/helpers/wsf_starts_with_filter_handler.e b/library/server/wsf/router/support/starts_with/helpers/wsf_starts_with_filter_handler.e index fe3c15c8..3fd11575 100644 --- a/library/server/wsf/router/support/starts_with/helpers/wsf_starts_with_filter_handler.e +++ b/library/server/wsf/router/support/starts_with/helpers/wsf_starts_with_filter_handler.e @@ -8,18 +8,10 @@ deferred class WSF_STARTS_WITH_FILTER_HANDLER inherit - WSF_FILTER_HANDLER - redefine - next - end + WSF_FILTER_HANDLER [WSF_STARTS_WITH_HANDLER] WSF_STARTS_WITH_HANDLER -feature -- Access - - next: detachable WSF_STARTS_WITH_FILTER_HANDLER - -- Next handler - feature -- Execution execute_next (a_start_path: READABLE_STRING_8; req: WSF_REQUEST; res: WSF_RESPONSE) @@ -30,7 +22,7 @@ feature -- Execution end note - copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others" + copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others" license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)" source: "[ Eiffel Software diff --git a/library/server/wsf/router/support/uri/helpers/wsf_uri_filter_handler.e b/library/server/wsf/router/support/uri/helpers/wsf_uri_filter_handler.e index 79ae3970..2758c84a 100644 --- a/library/server/wsf/router/support/uri/helpers/wsf_uri_filter_handler.e +++ b/library/server/wsf/router/support/uri/helpers/wsf_uri_filter_handler.e @@ -8,18 +8,10 @@ deferred class WSF_URI_FILTER_HANDLER inherit - WSF_FILTER_HANDLER - redefine - next - end + WSF_FILTER_HANDLER [WSF_URI_HANDLER] WSF_URI_HANDLER -feature -- Access - - next: detachable WSF_URI_FILTER_HANDLER - -- Next handler - feature -- Execution execute_next (req: WSF_REQUEST; res: WSF_RESPONSE) @@ -30,7 +22,7 @@ feature -- Execution end note - copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others" + copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others" license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)" source: "[ Eiffel Software diff --git a/library/server/wsf/router/support/uri_template/helpers/wsf_uri_template_filter_handler.e b/library/server/wsf/router/support/uri_template/helpers/wsf_uri_template_filter_handler.e index e6a1d02a..8762a0e2 100644 --- a/library/server/wsf/router/support/uri_template/helpers/wsf_uri_template_filter_handler.e +++ b/library/server/wsf/router/support/uri_template/helpers/wsf_uri_template_filter_handler.e @@ -8,18 +8,10 @@ deferred class WSF_URI_TEMPLATE_FILTER_HANDLER inherit - WSF_FILTER_HANDLER - redefine - next - end + WSF_FILTER_HANDLER [WSF_URI_TEMPLATE_HANDLER] WSF_URI_TEMPLATE_HANDLER -feature -- Access - - next: detachable WSF_URI_TEMPLATE_HANDLER - -- Next handler - feature -- Execution execute_next (req: WSF_REQUEST; res: WSF_RESPONSE) @@ -30,7 +22,7 @@ feature -- Execution end note - copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others" + copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others" license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)" source: "[ Eiffel Software diff --git a/library/server/wsf/router_context/wsf_filter_context_handler.e b/library/server/wsf/router_context/wsf_filter_context_handler.e index 761d509f..b137e066 100644 --- a/library/server/wsf/router_context/wsf_filter_context_handler.e +++ b/library/server/wsf/router_context/wsf_filter_context_handler.e @@ -8,18 +8,10 @@ deferred class WSF_FILTER_CONTEXT_HANDLER [C -> WSF_HANDLER_CONTEXT create make end] inherit - WSF_FILTER_HANDLER - redefine - next - end + WSF_FILTER_HANDLER [WSF_CONTEXT_HANDLER [C]] WSF_CONTEXT_HANDLER [C] -feature -- Access - - next: detachable WSF_CONTEXT_HANDLER [C] - -- Next handler - feature {NONE} -- Implementation execute_next (ctx: C; req: WSF_REQUEST; res: WSF_RESPONSE) @@ -30,7 +22,7 @@ feature {NONE} -- Implementation end note - copyright: "2011-2012, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others" + copyright: "2011-2013, Jocelyn Fiat, Javier Velilla, Olivier Ligot, Eiffel Software and others" license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)" source: "[ Eiffel Software