Removed SWIG artifacts that are no more useful

Author: Sebastiano Merlino

src/http_request.cpp

@@ -61,136 +61,28 @@ bool http_request::check_digest_auth(
     return true;
 }
 
-const std::vector<std::pair<std::string, std::string> > http_request::get_headers() const
-{
-    std::vector<std::pair<std::string, std::string> > to_ret;
-    std::map<std::string, std::string, header_comparator>::const_iterator it;
-    for(it = headers.begin(); it != headers.end(); ++it)
-#ifdef USE_CPP_ZEROX
-        to_ret.push_back(std::make_pair((*it).first,(*it).second));
-#else
-        to_ret.push_back(std::make_pair<std::string, std::string>((*it).first,(*it).second));
-#endif
-    return to_ret;
-}
-size_t http_request::get_headers(std::vector<std::pair<std::string, std::string> >& result) const
-{
-    std::map<std::string, std::string, header_comparator>::const_iterator it;
-    for(it = headers.begin(); it != headers.end(); ++it)
-#ifdef USE_CPP_ZEROX
-        result.push_back(std::make_pair((*it).first,(*it).second));
-#else
-        result.push_back(std::make_pair<std::string, std::string>((*it).first,(*it).second));
-#endif
-    return result.size();
-}
-
-#ifndef SWIG
 size_t http_request::get_headers(std::map<std::string, std::string, header_comparator>& result) const
 {
     result = this->headers;
     return result.size();
 }
-#endif
-
-const std::vector<std::pair<std::string, std::string> > http_request::get_footers() const
-{
-    std::vector<std::pair<std::string, std::string> > to_ret;
-    std::map<std::string, std::string, header_comparator>::const_iterator it;
-    for(it = footers.begin(); it != footers.end(); ++it)
-#ifdef USE_CPP_ZEROX
-        to_ret.push_back(std::make_pair((*it).first,(*it).second));
-#else
-        to_ret.push_back(std::make_pair<std::string, std::string>((*it).first,(*it).second));
-#endif
-    return to_ret;
-}
-size_t http_request::get_footers(std::vector<std::pair<std::string, std::string> >& result) const
-{
-    std::map<std::string, std::string, header_comparator>::const_iterator it;
-    for(it = footers.begin(); it != footers.end(); ++it)
-#ifdef USE_CPP_ZEROX
-        result.push_back(std::make_pair((*it).first,(*it).second));
-#else
-        result.push_back(std::make_pair<std::string, std::string>((*it).first,(*it).second));
-#endif
-    return result.size();
-}
 
-#ifndef SWIG
 size_t http_request::get_footers(std::map<std::string, std::string, header_comparator>& result) const
 {
     result = this->footers;
     return result.size();
 }
-#endif
-
-const std::vector<std::pair<std::string, std::string> > http_request::get_cookies() const
-{
-    std::vector<std::pair<std::string, std::string> > to_ret;
-    std::map<std::string, std::string, header_comparator>::const_iterator it;
-    for(it = cookies.begin(); it != cookies.end(); ++it)
-#ifdef USE_CPP_ZEROX
-        to_ret.push_back(std::make_pair((*it).first,(*it).second));
-#else
-        to_ret.push_back(std::make_pair<std::string, std::string>((*it).first,(*it).second));
-#endif
-    return to_ret;
-}
-
-size_t http_request::get_cookies(std::vector<std::pair<std::string, std::string> >& result) const
-{
-    std::map<std::string, std::string, header_comparator>::const_iterator it;
-    for(it = cookies.begin(); it != cookies.end(); ++it)
-#ifdef USE_CPP_ZEROX
-        result.push_back(std::make_pair((*it).first,(*it).second));
-#else
-        result.push_back(std::make_pair<std::string, std::string>((*it).first,(*it).second));
-#endif
-    return result.size();
-}
 
-#ifndef SWIG
 size_t http_request::get_cookies(std::map<std::string, std::string, header_comparator>& result) const
 {
     result = this->cookies;
     return result.size();
 }
-#endif
-
-const std::vector<std::pair<std::string, std::string> > http_request::get_args() const
-{
-    std::vector<std::pair<std::string, std::string> > to_ret;
-    std::map<std::string, std::string, arg_comparator>::const_iterator it;
-    for(it = args.begin(); it != args.end(); ++it)
-#ifdef USE_CPP_ZEROX
-        to_ret.push_back(std::make_pair((*it).first,(*it).second));
-#else
-        to_ret.push_back(std::make_pair<std::string, std::string>((*it).first,(*it).second));
-#endif
-    return to_ret;
-}
-
-size_t http_request::get_args(std::vector<std::pair<std::string, std::string> >& result) const
-{
-    std::map<std::string, std::string, header_comparator>::const_iterator it;
-    for(it = args.begin(); it != args.end(); ++it)
-#ifdef USE_CPP_ZEROX
-        result.push_back(std::make_pair((*it).first,(*it).second));
-#else
-        result.push_back(std::make_pair<std::string, std::string>((*it).first,(*it).second));
-#endif
-    return result.size();
-}
 
-#ifndef SWIG
 size_t http_request::get_args(std::map<std::string, std::string, arg_comparator>& result) const
 {
     result = this->args;
     return result.size();
 }
-#endif
-
-
 
 };

src/http_response.cpp

@@ -37,63 +37,18 @@ http_response::~http_response()
         webserver::unlock_cache_entry(ce);
 }
 
-const std::vector<std::pair<std::string, std::string> > http_response::get_headers()
-{
-    std::vector<std::pair<std::string, std::string> > to_ret;
-    std::map<std::string, std::string, header_comparator>::const_iterator it;
-    for(it = headers.begin(); it != headers.end(); ++it)
-        to_ret.push_back(*it);
-    return to_ret;
-}
-size_t http_response::get_headers(std::vector<std::pair<std::string, std::string> >& result)
-{
-    std::map<std::string, std::string, header_comparator>::const_iterator it;
-    for(it = headers.begin(); it != headers.end(); ++it)
-        result.push_back(*it);
-    return result.size();
-}
 size_t http_response::get_headers(std::map<std::string, std::string, header_comparator>& result)
 {
     result = this->headers;
     return result.size();
 }
 
-const std::vector<std::pair<std::string, std::string> > http_response::get_footers()
-{
-    std::vector<std::pair<std::string, std::string> > to_ret;
-    std::map<std::string, std::string, header_comparator>::const_iterator it;
-    for(it = footers.begin(); it != footers.end(); ++it)
-        to_ret.push_back(*it);
-    return to_ret;
-}
-size_t http_response::get_footers(std::vector<std::pair<std::string, std::string> >& result)
-{
-    std::map<std::string, std::string, arg_comparator>::const_iterator it;
-    for(it = footers.begin(); it != footers.end(); ++it)
-        result.push_back(*it);
-    return result.size();
-}
 size_t http_response::get_footers(std::map<std::string, std::string, header_comparator>& result)
 {
     result = this->footers;
     return result.size();
 }
 
-const std::vector<std::pair<std::string, std::string> > http_response::get_cookies()
-{
-    std::vector<std::pair<std::string, std::string> > to_ret;
-    std::map<std::string, std::string, header_comparator>::const_iterator it;
-    for(it = cookies.begin(); it != cookies.end(); ++it)
-        to_ret.push_back(*it);
-    return to_ret;
-}
-size_t http_response::get_cookies(std::vector<std::pair<std::string, std::string> >& result)
-{
-    std::map<std::string, std::string, header_comparator>::const_iterator it;
-    for(it = cookies.begin(); it != cookies.end(); ++it)
-        result.push_back(*it);
-    return result.size();
-}
 size_t http_response::get_cookies(std::map<std::string, std::string, header_comparator>& result)
 {
     result = this->cookies;

src/httpserver/http_request.hpp

@@ -188,82 +188,30 @@ class http_request
         {
             result = this->method;
         }
-        /**
-         * Method used to get all headers passed with the request.
-         * @return a vector<pair<string,string> > containing all headers.
-        **/
-        const std::vector<std::pair<std::string, std::string> > get_headers() const;
-        /**
-         * Method used to get all headers passed with the request.
-         * @param result a vector<pair<string, string> > that will be filled with all headers
-         * @result the size of the vector
-        **/
-        size_t get_headers(std::vector<std::pair<std::string, std::string> >& result) const;
-#ifndef SWIG
         /**
          * Method used to get all headers passed with the request.
          * @param result a map<string, string> > that will be filled with all headers
          * @result the size of the map
         **/
         size_t get_headers(std::map<std::string, std::string, header_comparator>& result) const;
-#endif
-        /**
-         * Method used to get all footers passed with the request.
-         * @return a vector<pair<string,string> > containing all footers.
-        **/
-        const std::vector<std::pair<std::string, std::string> > get_footers() const;
-        /**
-         * Method used to get all footers passed with the request.
-         * @param result a vector<pair<string, string> > that will be filled with all footers
-         * @result the size of the vector
-        **/
-        size_t get_footers(std::vector<std::pair<std::string, std::string> >& result) const;
-#ifndef SWIG
         /**
          * Method used to get all footers passed with the request.
          * @param result a map<string, string> > that will be filled with all footers
          * @result the size of the map
         **/
         size_t get_footers(std::map<std::string, std::string, header_comparator>& result) const;
-#endif
-        /**
-         * Method used to get all cookies passed with the request.
-         * @return a vector<pair<string, string> > containing all cookies.
-        **/
-        const std::vector<std::pair<std::string, std::string> > get_cookies() const;
-        /**
-         * Method used to get all cookies passed with the request.
-         * @param result a vector<pair<string, string> > that will be filled with all cookies
-         * @result the size of the vector
-        **/
-        size_t get_cookies(std::vector<std::pair<std::string, std::string> >& result) const;
-#ifndef SWIG
         /**
          * Method used to get all cookies passed with the request.
          * @param result a map<string, string> > that will be filled with all cookies
          * @result the size of the map
         **/
         size_t get_cookies(std::map<std::string, std::string, header_comparator>& result) const;
-#endif
-        /**
-         * Method used to get all parameters passed with the request. Usually parameters are passed with DELETE or GET methods.
-         * @return a map<string,string> containing all parameters.
-        **/
-        const std::vector<std::pair<std::string, std::string> > get_args() const;
-        /**
-         * Method used to get all args passed with the request.
-         * @param result a vector<pair<string, string> > that will be filled with all args
-         * @result the size of the vector
-        **/
-        size_t get_args(std::vector<std::pair<std::string, std::string> >& result) const;
-#ifndef SWIG
         /**
          * Method used to get all args passed with the request.
          * @param result a map<string, string> > that will be filled with all args
          * @result the size of the map
         **/
         size_t get_args(std::map<std::string, std::string, arg_comparator>& result) const;
-#endif
         /**
          * Method used to get a specific header passed with the request.
          * @param key the specific header to get the value from

src/httpserver/http_response.hpp

@@ -254,37 +254,19 @@ class http_response
          * Method used to get all headers passed with the request.
          * @return a map<string,string> containing all headers.
         **/
-        const std::vector<std::pair<std::string, std::string> > get_headers();
-        size_t get_headers(
-                std::vector<std::pair<std::string, std::string> >& result
-        );
-#ifndef SWIG
         size_t get_headers(
                 std::map<std::string, std::string, header_comparator>& result
         );
-#endif
         /**
          * Method used to get all footers passed with the request.
          * @return a map<string,string> containing all footers.
         **/
-        const std::vector<std::pair<std::string, std::string> > get_footers();
-        size_t get_footers(
-                std::vector<std::pair<std::string, std::string> >& result
-        );
-#ifndef SWIG
         size_t get_footers(
                 std::map<std::string, std::string, header_comparator>& result
         );
-#endif
-        const std::vector<std::pair<std::string, std::string> > get_cookies();
-        size_t get_cookies(
-                std::vector<std::pair<std::string, std::string> >& result
-        );
-#ifndef SWIG
         size_t get_cookies(
                 std::map<std::string, std::string, header_comparator>& result
         );
-#endif
         /**
          * Method used to set all headers of the response.
          * @param headers The headers key-value map to set for the response.