From 9958bb27a1dd55f637e542b97c3b62ca7368968a Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Tue, 20 Aug 2013 13:15:37 +0200 Subject: [PATCH] Removed WSF_ROUTING_HANDLER.make_with_router (a_router) It was not used in existing code, and potentially dangerous, if coder reuses router by accident. --- .../starts_with/helpers/wsf_starts_with_routing_handler.e | 5 ++--- .../router/support/uri/helpers/wsf_uri_routing_handler.e | 5 ++--- .../helpers/wsf_uri_template_routing_handler.e | 5 ++--- library/server/wsf/router/wsf_routing_handler.e | 7 +------ .../helpers/wsf_starts_with_routing_context_handler.e | 5 ++--- .../support/uri/helpers/wsf_uri_routing_context_handler.e | 5 ++--- .../helpers/wsf_uri_template_routing_context_handler.e | 5 ++--- .../wsf/router_context/wsf_routing_context_handler.e | 5 ++--- 8 files changed, 15 insertions(+), 27 deletions(-) diff --git a/library/server/wsf/router/support/starts_with/helpers/wsf_starts_with_routing_handler.e b/library/server/wsf/router/support/starts_with/helpers/wsf_starts_with_routing_handler.e index b247c358..088ff44b 100644 --- a/library/server/wsf/router/support/starts_with/helpers/wsf_starts_with_routing_handler.e +++ b/library/server/wsf/router/support/starts_with/helpers/wsf_starts_with_routing_handler.e @@ -16,8 +16,7 @@ inherit end create - make, - make_with_router + make feature -- Execution @@ -29,7 +28,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_routing_handler.e b/library/server/wsf/router/support/uri/helpers/wsf_uri_routing_handler.e index 27798b6e..3cb787e0 100644 --- a/library/server/wsf/router/support/uri/helpers/wsf_uri_routing_handler.e +++ b/library/server/wsf/router/support/uri/helpers/wsf_uri_routing_handler.e @@ -13,11 +13,10 @@ inherit WSF_URI_HANDLER create - make, - make_with_router + make 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_routing_handler.e b/library/server/wsf/router/support/uri_template/helpers/wsf_uri_template_routing_handler.e index 48e401a6..adc7b374 100644 --- a/library/server/wsf/router/support/uri_template/helpers/wsf_uri_template_routing_handler.e +++ b/library/server/wsf/router/support/uri_template/helpers/wsf_uri_template_routing_handler.e @@ -13,11 +13,10 @@ inherit WSF_URI_TEMPLATE_HANDLER create - make, - make_with_router + make 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/wsf_routing_handler.e b/library/server/wsf/router/wsf_routing_handler.e index 5aa855e5..33ae7cfb 100644 --- a/library/server/wsf/router/wsf_routing_handler.e +++ b/library/server/wsf/router/wsf_routing_handler.e @@ -12,14 +12,9 @@ inherit feature {NONE} -- Initialization - make_with_router (a_router: like router) - do - router := a_router - end - make (n: INTEGER) do - make_with_router (create {like router}.make (n)) + create router.make (n) end feature -- Access diff --git a/library/server/wsf/router_context/support/starts_with/helpers/wsf_starts_with_routing_context_handler.e b/library/server/wsf/router_context/support/starts_with/helpers/wsf_starts_with_routing_context_handler.e index 74965647..064ddac8 100644 --- a/library/server/wsf/router_context/support/starts_with/helpers/wsf_starts_with_routing_context_handler.e +++ b/library/server/wsf/router_context/support/starts_with/helpers/wsf_starts_with_routing_context_handler.e @@ -16,8 +16,7 @@ inherit end create - make, - make_with_router + make feature -- Execution @@ -27,7 +26,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/support/uri/helpers/wsf_uri_routing_context_handler.e b/library/server/wsf/router_context/support/uri/helpers/wsf_uri_routing_context_handler.e index f76caf41..5a084d81 100644 --- a/library/server/wsf/router_context/support/uri/helpers/wsf_uri_routing_context_handler.e +++ b/library/server/wsf/router_context/support/uri/helpers/wsf_uri_routing_context_handler.e @@ -18,8 +18,7 @@ inherit end create - make, - make_with_router + make feature -- Execution @@ -31,7 +30,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/support/uri_template/helpers/wsf_uri_template_routing_context_handler.e b/library/server/wsf/router_context/support/uri_template/helpers/wsf_uri_template_routing_context_handler.e index 6ddb157c..bdf7ff6b 100644 --- a/library/server/wsf/router_context/support/uri_template/helpers/wsf_uri_template_routing_context_handler.e +++ b/library/server/wsf/router_context/support/uri_template/helpers/wsf_uri_template_routing_context_handler.e @@ -18,8 +18,7 @@ inherit end create - make, - make_with_router + make feature -- Execution @@ -31,7 +30,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_routing_context_handler.e b/library/server/wsf/router_context/wsf_routing_context_handler.e index 25e784da..214a542d 100644 --- a/library/server/wsf/router_context/wsf_routing_context_handler.e +++ b/library/server/wsf/router_context/wsf_routing_context_handler.e @@ -15,8 +15,7 @@ inherit end create - make, - make_with_router + make feature -- Execution @@ -26,7 +25,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