From 60574ee85f7aa212eb3a7700ec551820dd3b256d Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Tue, 17 Jan 2012 16:35:52 +0100 Subject: [PATCH] REQUEST_ROUTER now inherit from ITERABLE [..] --- library/server/wsf/router/request_router.e | 5 +++-- .../wsf/router/uri_template/request_uri_template_router_i.e | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/library/server/wsf/router/request_router.e b/library/server/wsf/router/request_router.e index e903a893..99e6a316 100644 --- a/library/server/wsf/router/request_router.e +++ b/library/server/wsf/router/request_router.e @@ -7,6 +7,9 @@ note deferred class REQUEST_ROUTER [H -> REQUEST_HANDLER [C], C -> REQUEST_HANDLER_CONTEXT] +inherit + ITERABLE [TUPLE [handler: H; resource: READABLE_STRING_8; request_methods: detachable ARRAY [READABLE_STRING_8]]] + feature -- Mapping map_default (h: like default_handler) @@ -102,8 +105,6 @@ feature -- Traversing new_cursor: ITERATION_CURSOR [TUPLE [handler: H; resource: READABLE_STRING_8; request_methods: detachable ARRAY [READABLE_STRING_8]]] -- Fresh cursor associated with current structure deferred - ensure - result_attached: Result /= Void end feature {NONE} -- Access: Implementation diff --git a/library/server/wsf/router/uri_template/request_uri_template_router_i.e b/library/server/wsf/router/uri_template/request_uri_template_router_i.e index 18ab2b42..23dfbf21 100644 --- a/library/server/wsf/router/uri_template/request_uri_template_router_i.e +++ b/library/server/wsf/router/uri_template/request_uri_template_router_i.e @@ -94,7 +94,7 @@ feature {NONE} -- Access: Implementation feature {NONE} -- Context factory - handler_context (p: detachable STRING; req: WSF_REQUEST; tpl: URI_TEMPLATE; tpl_res: URI_TEMPLATE_MATCH_RESULT): C + handler_context (p: detachable READABLE_STRING_8; req: WSF_REQUEST; tpl: URI_TEMPLATE; tpl_res: URI_TEMPLATE_MATCH_RESULT): C do if p /= Void then create Result.make (req, tpl, tpl_res, p)