Fixes as picked up by code review

This commit is contained in:
Colin Adams
2013-08-07 11:03:22 +01:00
parent 277eb0b4b6
commit 69da6c6d06
12 changed files with 363 additions and 149 deletions

View File

@@ -11,11 +11,8 @@ class WSF_PUT_HELPER
inherit
WSF_METHOD_HELPER
rename
send_get_response as do_put
redefine
execute_new_resource,
do_put
execute_new_resource
end
feature -- Basic operations
@@ -25,7 +22,7 @@ feature -- Basic operations
-- Policy routines are available in `a_handler'.
do
if a_handler.treat_as_moved_permanently (req) then
-- TODO 301 Moved permanently response (single location)
handle_redirection_error (req, res, a_handler.previous_location (req), {HTTP_STATUS_CODE}.moved_permanently)
else
handle_content_negotiation (req, res, a_handler, True)
end
@@ -34,17 +31,24 @@ feature -- Basic operations
feature {NONE} -- Implementation
do_put (req: WSF_REQUEST; res: WSF_RESPONSE; a_handler: WSF_SKELETON_HANDLER; a_header: HTTP_HEADER;
send_response (req: WSF_REQUEST; res: WSF_RESPONSE; a_handler: WSF_SKELETON_HANDLER; a_header: HTTP_HEADER;
a_media_type, a_language_type, a_character_type, a_compression_type: detachable READABLE_STRING_8; a_new_resource: BOOLEAN)
-- Write response to `req' into `res' in accordance with `a_media_type' etc. as a new URI.
local
l_code: NATURAL
do
a_handler.read_entity (req)
if a_handler.is_entity_too_large (req) then
handle_request_entity_too_large (req, res, a_handler)
else
a_handler.check_content_headers (req)
if a_handler.content_check_code (req) /= 0 then
-- TODO - 415 or 501
l_code := a_handler.content_check_code (req)
if l_code /= 0 then
if l_code = 415 then
handle_unsupported_media_type (req, res)
else
handle_not_implemented (req, res)
end
else
a_handler.check_request (req, res)
if a_handler.request_check_code (req) = 0 then
@@ -56,20 +60,12 @@ feature {NONE} -- Implementation
if a_handler.conflict_check_code (req) = 0 then
a_handler.update_resource (req, res)
-- 204 or 500 (add support for this?)
-- TODO: more support, such as includes_response_entity
-- FIXME: more support, such as includes_response_entity
end
end
end
end
end
end
handle_request_entity_too_large (req: WSF_REQUEST; res: WSF_RESPONSE; a_handler: WSF_SKELETON_HANDLER)
-- TODO.
require
-- TODO
do
-- Need to check if condition is temporary.
end
end