some renaming to use _I for the generic classes, and removed the DEFAULT_ prefix for default implementation

this should makes things easier for new users
This commit is contained in:
Jocelyn Fiat
2011-09-14 15:39:37 +02:00
parent 840ae1e6e4
commit 1e3770d724
28 changed files with 65 additions and 65 deletions

View File

@@ -5,7 +5,7 @@ note
revision: "$Revision$"
deferred class
REST_APPLICATION [H -> REST_REQUEST_HANDLER [C], C -> REST_REQUEST_HANDLER_CONTEXT]
REST_APPLICATION_I [H -> REST_REQUEST_HANDLER [C], C -> REST_REQUEST_HANDLER_CONTEXT]
inherit
ROUTED_APPLICATION [H, C]

View File

@@ -8,7 +8,7 @@ class
REST_REQUEST_URI_HANDLER_CONTEXT
inherit
REQUEST_URI_HANDLER_CONTEXT
REQUEST_URI_HANDLER_CONTEXT_I
REST_REQUEST_HANDLER_CONTEXT
@@ -16,7 +16,7 @@ create
make
note
copyright: "2011-2011, Eiffel Software and others"
copyright: "Copyright (c) 1984-2011, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
source: "[
Eiffel Software

View File

@@ -8,7 +8,7 @@ class
REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT
inherit
REQUEST_URI_TEMPLATE_HANDLER_CONTEXT
REQUEST_URI_TEMPLATE_HANDLER_CONTEXT_I
REST_REQUEST_HANDLER_CONTEXT
@@ -16,7 +16,7 @@ create
make
note
copyright: "2011-2011, Eiffel Software and others"
copyright: "Copyright (c) 1984-2011, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
source: "[
Eiffel Software

View File

@@ -188,7 +188,7 @@ feature -- Execution
s.append_string ("</strong></div>")
end
s.append_string ("<div class=%"api-auth%">Authentication required: <strong>" + rq.authentication_required.out + "</strong></div>")
if attached {REST_REQUEST_URI_TEMPLATE_ROUTER [REST_REQUEST_HANDLER [REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT], REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT]} router as l_uri_template_router then
if attached {REST_REQUEST_URI_TEMPLATE_ROUTER_I [REST_REQUEST_HANDLER [REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT], REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT]} router as l_uri_template_router then
create l_uri_tpl.make (a_resource)
if attached l_uri_tpl.query_variable_names as l_query_variable_names and then not l_query_variable_names.is_empty then
s.append_string ("<div class=%"api-uri-template%">Query parameters: ")

View File

@@ -5,10 +5,10 @@ note
revision: "$Revision$"
deferred class
DEFAULT_REST_APPLICATION
REST_APPLICATION
inherit
REST_APPLICATION [REST_REQUEST_HANDLER [REST_REQUEST_HANDLER_CONTEXT], REST_REQUEST_HANDLER_CONTEXT]
REST_APPLICATION_I [REST_REQUEST_HANDLER [REST_REQUEST_HANDLER_CONTEXT], REST_REQUEST_HANDLER_CONTEXT]
note
copyright: "Copyright (c) 1984-2011, Eiffel Software and others"

View File

@@ -5,7 +5,7 @@ note
revision: "$Revision$"
deferred class
DEFAULT_REST_REQUEST_URI_HANDLER
REST_REQUEST_URI_HANDLER
inherit
REST_REQUEST_HANDLER [REST_REQUEST_URI_HANDLER_CONTEXT]

View File

@@ -5,10 +5,10 @@ note
revision: "$Revision$"
class
DEFAULT_REST_REQUEST_URI_ROUTER
REST_REQUEST_URI_ROUTER
inherit
REST_REQUEST_URI_ROUTER [REST_REQUEST_HANDLER [REST_REQUEST_URI_HANDLER_CONTEXT], REST_REQUEST_URI_HANDLER_CONTEXT]
REST_REQUEST_URI_ROUTER_I [REST_REQUEST_HANDLER [REST_REQUEST_URI_HANDLER_CONTEXT], REST_REQUEST_URI_HANDLER_CONTEXT]
redefine
map_agent_with_request_methods
end

View File

@@ -5,7 +5,7 @@ note
revision: "$Revision$"
deferred class
DEFAULT_REST_REQUEST_URI_TEMPLATE_HANDLER
REST_REQUEST_URI_TEMPLATE_HANDLER
inherit
REST_REQUEST_HANDLER [REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT]

View File

@@ -5,10 +5,10 @@ note
revision: "$Revision$"
class
DEFAULT_REST_REQUEST_URI_TEMPLATE_ROUTER
REST_REQUEST_URI_TEMPLATE_ROUTER
inherit
REST_REQUEST_URI_TEMPLATE_ROUTER [REST_REQUEST_HANDLER [REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT], REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT]
REST_REQUEST_URI_TEMPLATE_ROUTER_I [REST_REQUEST_HANDLER [REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT], REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT]
redefine
map_agent_with_request_methods
end

View File

@@ -5,10 +5,10 @@ note
revision: "$Revision$"
class
DEFAULT_REST_REQUEST_URI_TEMPLATE_ROUTING_HANDLER
REST_REQUEST_URI_TEMPLATE_ROUTING_HANDLER
inherit
REST_REQUEST_URI_TEMPLATE_ROUTING_HANDLER [REST_REQUEST_HANDLER [REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT], REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT]
REST_REQUEST_URI_TEMPLATE_ROUTING_HANDLER_I [REST_REQUEST_HANDLER [REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT], REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT]
redefine
router
end
@@ -18,7 +18,7 @@ create
feature {NONE} -- Routing
router: DEFAULT_REST_REQUEST_URI_TEMPLATE_ROUTER
router: REST_REQUEST_URI_TEMPLATE_ROUTER
;note
copyright: "Copyright (c) 1984-2011, Eiffel Software and others"

View File

@@ -5,17 +5,17 @@ note
revision: "$Revision$"
deferred class
DEFAULT_REST_URI_APPLICATION
REST_URI_APPLICATION
inherit
REST_APPLICATION [REST_REQUEST_HANDLER [REST_REQUEST_URI_HANDLER_CONTEXT], REST_REQUEST_URI_HANDLER_CONTEXT]
REST_APPLICATION_I [REST_REQUEST_HANDLER [REST_REQUEST_URI_HANDLER_CONTEXT], REST_REQUEST_URI_HANDLER_CONTEXT]
redefine
router
end
feature -- Router
router: DEFAULT_REST_REQUEST_URI_ROUTER
router: REST_REQUEST_URI_ROUTER
;note
copyright: "Copyright (c) 1984-2011, Eiffel Software and others"

View File

@@ -5,17 +5,17 @@ note
revision: "$Revision$"
deferred class
DEFAULT_REST_URI_TEMPLATE_APPLICATION
REST_URI_TEMPLATE_APPLICATION
inherit
REST_APPLICATION [REST_REQUEST_HANDLER [REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT], REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT]
REST_APPLICATION_I [REST_REQUEST_HANDLER [REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT], REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT]
redefine
router
end
feature -- Router
router: DEFAULT_REST_REQUEST_URI_TEMPLATE_ROUTER
router: REST_REQUEST_URI_TEMPLATE_ROUTER
;note
copyright: "Copyright (c) 1984-2011, Eiffel Software and others"

View File

@@ -5,11 +5,11 @@ note
revision: "$Revision$"
class
REST_REQUEST_URI_ROUTING_HANDLER [H -> REST_REQUEST_HANDLER [C],
REST_REQUEST_URI_ROUTING_HANDLER_I [H -> REST_REQUEST_HANDLER [C],
C -> REST_REQUEST_URI_HANDLER_CONTEXT create make end]
inherit
REQUEST_URI_ROUTING_HANDLER [H, C]
REQUEST_URI_ROUTING_HANDLER_I [H, C]
redefine
router,
execute
@@ -36,7 +36,7 @@ feature -- Execution
feature {NONE} -- Routing
router: REST_REQUEST_URI_ROUTER [H, C]
router: REST_REQUEST_URI_ROUTER_I [H, C]
;note
copyright: "Copyright (c) 1984-2011, Eiffel Software and others"

View File

@@ -5,11 +5,11 @@ note
revision: "$Revision$"
class
REST_REQUEST_URI_TEMPLATE_ROUTING_HANDLER [H -> REST_REQUEST_HANDLER [C],
REST_REQUEST_URI_TEMPLATE_ROUTING_HANDLER_I [H -> REST_REQUEST_HANDLER [C],
C -> REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT create make end]
inherit
REQUEST_URI_TEMPLATE_ROUTING_HANDLER [H, C]
REQUEST_URI_TEMPLATE_ROUTING_HANDLER_I [H, C]
redefine
router,
execute
@@ -36,7 +36,7 @@ feature -- Execution
feature {NONE} -- Routing
router: REST_REQUEST_URI_TEMPLATE_ROUTER [H, C]
router: REST_REQUEST_URI_TEMPLATE_ROUTER_I [H, C]
;note
copyright: "Copyright (c) 1984-2011, Eiffel Software and others"

View File

@@ -5,10 +5,10 @@ note
revision: "$Revision$"
class
REST_REQUEST_URI_ROUTER [H -> REST_REQUEST_HANDLER [C], C -> REST_REQUEST_URI_HANDLER_CONTEXT create make end]
REST_REQUEST_URI_ROUTER_I [H -> REST_REQUEST_HANDLER [C], C -> REST_REQUEST_URI_HANDLER_CONTEXT create make end]
inherit
REQUEST_URI_ROUTER [H, C]
REQUEST_URI_ROUTER_I [H, C]
REST_REQUEST_ROUTER [H, C]

View File

@@ -5,10 +5,10 @@ note
revision: "$Revision$"
class
REST_REQUEST_URI_TEMPLATE_ROUTER [H -> REST_REQUEST_HANDLER [C], C -> REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT create make end]
REST_REQUEST_URI_TEMPLATE_ROUTER_I [H -> REST_REQUEST_HANDLER [C], C -> REST_REQUEST_URI_TEMPLATE_HANDLER_CONTEXT create make end]
inherit
REQUEST_URI_TEMPLATE_ROUTER [H, C]
REQUEST_URI_TEMPLATE_ROUTER_I [H, C]
REST_REQUEST_ROUTER [H, C]

View File

@@ -5,10 +5,10 @@ note
revision: "$Revision$"
class
DEFAULT_REQUEST_URI_ROUTER
REQUEST_URI_ROUTER
inherit
REQUEST_URI_ROUTER [REQUEST_HANDLER [REQUEST_URI_HANDLER_CONTEXT], REQUEST_URI_HANDLER_CONTEXT]
REQUEST_URI_ROUTER_I [REQUEST_HANDLER [REQUEST_URI_HANDLER_CONTEXT_I], REQUEST_URI_HANDLER_CONTEXT_I]
redefine
map_agent_with_request_methods
end
@@ -17,10 +17,10 @@ create
feature -- Mapping
map_agent_with_request_methods (a_id: READABLE_STRING_8; a_action: PROCEDURE [ANY, TUPLE [ctx: REQUEST_URI_HANDLER_CONTEXT; req: WGI_REQUEST; res: WGI_RESPONSE_BUFFER]];
map_agent_with_request_methods (a_id: READABLE_STRING_8; a_action: PROCEDURE [ANY, TUPLE [ctx: REQUEST_URI_HANDLER_CONTEXT_I; req: WGI_REQUEST; res: WGI_RESPONSE_BUFFER]];
rqst_methods: detachable ARRAY [READABLE_STRING_8])
local
h: REQUEST_AGENT_HANDLER [REQUEST_URI_HANDLER_CONTEXT]
h: REQUEST_AGENT_HANDLER [REQUEST_URI_HANDLER_CONTEXT_I]
do
create h.make (a_action)
map_with_request_methods (a_id, h, rqst_methods)

View File

@@ -5,10 +5,10 @@ note
revision: "$Revision$"
class
DEFAULT_REQUEST_URI_ROUTING_HANDLER
REQUEST_URI_ROUTING_HANDLER
inherit
REQUEST_URI_ROUTING_HANDLER [REQUEST_HANDLER [REQUEST_URI_HANDLER_CONTEXT], REQUEST_URI_HANDLER_CONTEXT]
REQUEST_URI_ROUTING_HANDLER_I [REQUEST_HANDLER [REQUEST_URI_HANDLER_CONTEXT_I], REQUEST_URI_HANDLER_CONTEXT_I]
redefine
router
end
@@ -18,7 +18,7 @@ create
feature {NONE} -- Routing
router: DEFAULT_REQUEST_URI_ROUTER
router: REQUEST_URI_ROUTER
;note
copyright: "2011-2011, Eiffel Software and others"

View File

@@ -5,10 +5,10 @@ note
revision: "$Revision$"
class
DEFAULT_REQUEST_URI_TEMPLATE_ROUTER
REQUEST_URI_TEMPLATE_ROUTER
inherit
REQUEST_URI_TEMPLATE_ROUTER [REQUEST_HANDLER [REQUEST_URI_TEMPLATE_HANDLER_CONTEXT], REQUEST_URI_TEMPLATE_HANDLER_CONTEXT]
REQUEST_URI_TEMPLATE_ROUTER_I [REQUEST_HANDLER [REQUEST_URI_TEMPLATE_HANDLER_CONTEXT_I], REQUEST_URI_TEMPLATE_HANDLER_CONTEXT_I]
redefine
map_agent_with_request_methods
end
@@ -18,10 +18,10 @@ create
feature -- Mapping
map_agent_with_request_methods (a_id: READABLE_STRING_8; a_action: PROCEDURE [ANY, TUPLE [ctx: REQUEST_URI_TEMPLATE_HANDLER_CONTEXT; req: WGI_REQUEST; res: WGI_RESPONSE_BUFFER]];
map_agent_with_request_methods (a_id: READABLE_STRING_8; a_action: PROCEDURE [ANY, TUPLE [ctx: REQUEST_URI_TEMPLATE_HANDLER_CONTEXT_I; req: WGI_REQUEST; res: WGI_RESPONSE_BUFFER]];
rqst_methods: detachable ARRAY [READABLE_STRING_8])
local
h: REQUEST_AGENT_HANDLER [REQUEST_URI_TEMPLATE_HANDLER_CONTEXT]
h: REQUEST_AGENT_HANDLER [REQUEST_URI_TEMPLATE_HANDLER_CONTEXT_I]
do
create h.make (a_action)
map_with_request_methods (a_id, h, rqst_methods)

View File

@@ -5,10 +5,10 @@ note
revision: "$Revision$"
class
DEFAULT_REQUEST_URI_TEMPLATE_ROUTING_HANDLER
REQUEST_URI_TEMPLATE_ROUTING_HANDLER
inherit
REQUEST_URI_TEMPLATE_ROUTING_HANDLER [REQUEST_HANDLER [REQUEST_URI_TEMPLATE_HANDLER_CONTEXT], REQUEST_URI_TEMPLATE_HANDLER_CONTEXT]
REQUEST_URI_TEMPLATE_ROUTING_HANDLER_I [REQUEST_HANDLER [REQUEST_URI_TEMPLATE_HANDLER_CONTEXT_I], REQUEST_URI_TEMPLATE_HANDLER_CONTEXT_I]
redefine
router
end
@@ -18,7 +18,7 @@ create
feature {NONE} -- Routing
router: DEFAULT_REQUEST_URI_TEMPLATE_ROUTER
router: REQUEST_URI_TEMPLATE_ROUTER
;note
copyright: "2011-2011, Eiffel Software and others"

View File

@@ -5,17 +5,17 @@ note
revision: "$Revision$"
deferred class
DEFAULT_URI_ROUTED_APPLICATION
URI_ROUTED_APPLICATION
inherit
ROUTED_APPLICATION [REQUEST_HANDLER [REQUEST_URI_HANDLER_CONTEXT], REQUEST_URI_HANDLER_CONTEXT]
ROUTED_APPLICATION [REQUEST_HANDLER [REQUEST_URI_HANDLER_CONTEXT_I], REQUEST_URI_HANDLER_CONTEXT_I]
redefine
router
end
feature -- Router
router: DEFAULT_REQUEST_URI_ROUTER
router: REQUEST_URI_ROUTER
;note
copyright: "2011-2011, Eiffel Software and others"

View File

@@ -5,17 +5,17 @@ note
revision: "$Revision$"
deferred class
DEFAULT_URI_TEMPLATE_ROUTED_APPLICATION
URI_TEMPLATE_ROUTED_APPLICATION
inherit
ROUTED_APPLICATION [REQUEST_HANDLER [REQUEST_URI_TEMPLATE_HANDLER_CONTEXT], REQUEST_URI_TEMPLATE_HANDLER_CONTEXT]
ROUTED_APPLICATION [REQUEST_HANDLER [REQUEST_URI_TEMPLATE_HANDLER_CONTEXT_I], REQUEST_URI_TEMPLATE_HANDLER_CONTEXT_I]
redefine
router
end
feature -- Router
router: DEFAULT_REQUEST_URI_TEMPLATE_ROUTER
router: REQUEST_URI_TEMPLATE_ROUTER
;note
copyright: "2011-2011, Eiffel Software and others"

View File

@@ -5,7 +5,7 @@ note
revision: "$Revision$"
class
REQUEST_URI_HANDLER_CONTEXT
REQUEST_URI_HANDLER_CONTEXT_I
inherit
REQUEST_HANDLER_CONTEXT

View File

@@ -5,7 +5,7 @@ note
revision: "$Revision$"
class
REQUEST_URI_ROUTER [H -> REQUEST_HANDLER [C], C -> REQUEST_URI_HANDLER_CONTEXT create make end]
REQUEST_URI_ROUTER_I [H -> REQUEST_HANDLER [C], C -> REQUEST_URI_HANDLER_CONTEXT_I create make end]
inherit
REQUEST_ROUTER [H, C]

View File

@@ -5,8 +5,8 @@ note
revision: "$Revision$"
class
REQUEST_URI_ROUTING_HANDLER [H -> REQUEST_HANDLER [C],
C -> REQUEST_URI_HANDLER_CONTEXT create make end]
REQUEST_URI_ROUTING_HANDLER_I [H -> REQUEST_HANDLER [C],
C -> REQUEST_URI_HANDLER_CONTEXT_I create make end]
inherit
REQUEST_ROUTING_HANDLER [H, C]
@@ -23,7 +23,7 @@ feature {NONE} -- Initialization
feature {NONE} -- Routing
router: REQUEST_URI_ROUTER [H, C]
router: REQUEST_URI_ROUTER_I [H, C]
;note
copyright: "2011-2011, Eiffel Software and others"

View File

@@ -5,7 +5,7 @@ note
revision: "$Revision$"
class
REQUEST_URI_TEMPLATE_HANDLER_CONTEXT
REQUEST_URI_TEMPLATE_HANDLER_CONTEXT_I
inherit
REQUEST_HANDLER_CONTEXT

View File

@@ -5,7 +5,7 @@ note
revision: "$Revision$"
class
REQUEST_URI_TEMPLATE_ROUTER [H -> REQUEST_HANDLER [C], C -> REQUEST_URI_TEMPLATE_HANDLER_CONTEXT create make end]
REQUEST_URI_TEMPLATE_ROUTER_I [H -> REQUEST_HANDLER [C], C -> REQUEST_URI_TEMPLATE_HANDLER_CONTEXT_I create make end]
inherit
REQUEST_ROUTER [H, C]

View File

@@ -5,8 +5,8 @@ note
revision: "$Revision$"
class
REQUEST_URI_TEMPLATE_ROUTING_HANDLER [H -> REQUEST_HANDLER [C],
C -> REQUEST_URI_TEMPLATE_HANDLER_CONTEXT create make end]
REQUEST_URI_TEMPLATE_ROUTING_HANDLER_I [H -> REQUEST_HANDLER [C],
C -> REQUEST_URI_TEMPLATE_HANDLER_CONTEXT_I create make end]
inherit
REQUEST_ROUTING_HANDLER [H, C]
@@ -23,7 +23,7 @@ feature {NONE} -- Initialization
feature {NONE} -- Routing
router: REQUEST_URI_TEMPLATE_ROUTER [H, C]
router: REQUEST_URI_TEMPLATE_ROUTER_I [H, C]
;note
copyright: "2011-2011, Eiffel Software and others"