From d9ad77f483202c05885b6100ac1c61844523fab5 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Tue, 22 May 2018 20:51:05 +0100 Subject: Remove parameter setters from ihttpRequest Only required for testing, always throw in production implementations. --- icespider/core/ihttpRequest.h | 4 ---- icespider/fcgi/cgiRequestBase.cpp | 30 ------------------------------ icespider/fcgi/cgiRequestBase.h | 4 ---- icespider/testing/testRequest.h | 8 ++++---- 4 files changed, 4 insertions(+), 42 deletions(-) diff --git a/icespider/core/ihttpRequest.h b/icespider/core/ihttpRequest.h index 23a9d7e..e255886 100644 --- a/icespider/core/ihttpRequest.h +++ b/icespider/core/ihttpRequest.h @@ -32,10 +32,6 @@ namespace IceSpider { virtual OptionalString getHeaderParam(const std::string &) const = 0; virtual OptionalString getCookieParam(const std::string &) const = 0; virtual OptionalString getEnv(const std::string &) const = 0; - virtual void setQueryStringParam(const std::string &, const OptionalString &) = 0; - virtual void setHeaderParam(const std::string &, const OptionalString &) = 0; - virtual void setCookieParam(const std::string &, const OptionalString &) = 0; - virtual void setEnv(const std::string &, const OptionalString &) = 0; virtual Slicer::DeserializerPtr getDeserializer() const; virtual ContentTypeSerializer getSerializer(const IRouteHandler *) const; virtual std::istream & getInputStream() const = 0; diff --git a/icespider/fcgi/cgiRequestBase.cpp b/icespider/fcgi/cgiRequestBase.cpp index afeb560..96ec1b4 100644 --- a/icespider/fcgi/cgiRequestBase.cpp +++ b/icespider/fcgi/cgiRequestBase.cpp @@ -182,36 +182,6 @@ namespace IceSpider { return optionalLookup(HEADER_PREFIX + boost::algorithm::to_upper_copy(key), envmap); } - void - CgiRequestBase::setQueryStringParam(const std::string & key, const OptionalString & val) - { - if (val) - qsmap[key] = *val; - else - qsmap.erase(key); - } - - void - CgiRequestBase::setHeaderParam(const std::string &, const OptionalString &) - { - throw std::runtime_error("Changing the CGI environment is not supported."); - } - - void - CgiRequestBase::setCookieParam(const std::string & key, const OptionalString & val) - { - if (val) - cookiemap[key] = *val; - else - cookiemap.erase(key); - } - - void - CgiRequestBase::setEnv(const std::string &, const OptionalString &) - { - throw std::runtime_error("Changing the CGI environment is not supported."); - } - void CgiRequestBase::response(short statusCode, const std::string & statusMsg) const { StatusFmt::write(getOutputStream(), statusCode, statusMsg); diff --git a/icespider/fcgi/cgiRequestBase.h b/icespider/fcgi/cgiRequestBase.h index 9ccdfe3..0caf23f 100644 --- a/icespider/fcgi/cgiRequestBase.h +++ b/icespider/fcgi/cgiRequestBase.h @@ -24,10 +24,6 @@ namespace IceSpider { OptionalString getHeaderParam(const std::string & key) const override; OptionalString getCookieParam(const std::string & key) const override; OptionalString getEnv(const std::string & key) const override; - void setQueryStringParam(const std::string &, const OptionalString &) override; - void setHeaderParam(const std::string &, const OptionalString &) override; - void setCookieParam(const std::string &, const OptionalString &) override; - void setEnv(const std::string &, const OptionalString &) override; void response(short, const std::string &) const override; void setHeader(const std::string &, const std::string &) const override; diff --git a/icespider/testing/testRequest.h b/icespider/testing/testRequest.h index 9e510db..aa0ed67 100644 --- a/icespider/testing/testRequest.h +++ b/icespider/testing/testRequest.h @@ -18,10 +18,10 @@ namespace IceSpider { OptionalString getQueryStringParam(const std::string & key) const override; OptionalString getCookieParam(const std::string & key) const override; OptionalString getHeaderParam(const std::string & key) const override; - void setQueryStringParam(const std::string &, const OptionalString &) override; - void setHeaderParam(const std::string &, const OptionalString &) override; - void setCookieParam(const std::string &, const OptionalString &) override; - void setEnv(const std::string &, const OptionalString &) override; + void setQueryStringParam(const std::string &, const OptionalString &); + void setHeaderParam(const std::string &, const OptionalString &); + void setCookieParam(const std::string &, const OptionalString &); + void setEnv(const std::string &, const OptionalString &); std::istream & getInputStream() const override; std::ostream & getOutputStream() const override; void response(short statusCode, const std::string & statusMsg) const override; -- cgit v1.2.3