changes

Author: tmmsunny012

src/HTTPNode.cpp

@@ -7,22 +7,14 @@ namespace httpsserver {
     _path(path),
     _tag(tag),
     _nodeType(nodeType) {
-<<<<<<< HEAD
-
-=======
->>>>>>> upstream/pr/54
     // Count the parameters and store the indices
     size_t idx = 0;
     while((idx = path.find("/*", idx)) != std::string::npos) {
       // Skip the "/*"
       idx+=2;
       // Assure that we have either /* at the URL's end or /*/ somewhere in between
       if (idx == path.size() || path[idx] == '/') {
-<<<<<<< HEAD
         _pathParamIdx.push_back(idx - 1);
-=======
-        _urlParamIdx.push_back(idx - 1);
->>>>>>> upstream/pr/54
       }
     };
   }
@@ -34,44 +26,25 @@ namespace httpsserver {
     }
   }
 
-<<<<<<< HEAD
   bool HTTPNode::hasPathParameter() {
     return !_pathParamIdx.empty();
   }
 
   ssize_t HTTPNode::getParamIdx(size_t idx) {
     if (idx<_pathParamIdx.size()) {
       return _pathParamIdx[idx];
-=======
-  bool HTTPNode::hasUrlParameter() {
-    return !_urlParamIdx.empty();
-  }
-
-  ssize_t HTTPNode::getParamIdx(size_t idx) {
-    if (idx<_urlParamIdx.size()) {
-      return _urlParamIdx[idx];
->>>>>>> upstream/pr/54
     } else {
       return -1;
     }
   }
 
-<<<<<<< HEAD
   size_t HTTPNode::getPathParamCount() {
     return _pathParamIdx.size();
   }
 
   void HTTPNode::addPathParamValidator(size_t paramIdx, const HTTPValidationFunction * validator) {
     _validators.push_back(new HTTPValidator(paramIdx, validator));
 
-=======
-  size_t HTTPNode::getUrlParamCount() {
-    return _urlParamIdx.size();
-  }
-
-  void HTTPNode::addURLParamValidator(uint8_t paramIdx, const HTTPValidationFunction * validator) {
-    _validators.push_back(new HTTPValidator(paramIdx, validator));
->>>>>>> upstream/pr/54
   }
 
   std::vector<HTTPValidator*> * HTTPNode::getValidators() {

src/HTTPNode.hpp

@@ -43,13 +43,8 @@ class HTTPNode {
   /** Stores the type of the node (as we have not runtime type information by default) */
   const HTTPNodeType _nodeType;
 
-<<<<<<< HEAD
-  bool hasPathParameter();
-  size_t getPathParamCount();
-=======
   bool hasUrlParameter();
   size_t getUrlParamCount();
->>>>>>> upstream/pr/54
   ssize_t getParamIdx(size_t);
 
   std::vector<HTTPValidator*> * getValidators();
@@ -66,11 +61,7 @@ class HTTPNode {
   void addPathParamValidator(size_t paramIdx, const HTTPValidationFunction * validator);
 
 private:
-<<<<<<< HEAD
-  std::vector<size_t> _pathParamIdx;
-=======
   std::vector<size_t> _urlParamIdx;
->>>>>>> upstream/pr/54
   std::vector<HTTPValidator*> _validators;
 };
 

src/HTTPSCallbackFunction.hpp

@@ -10,11 +10,7 @@ namespace httpsserver {
   /**
    * \brief A callback function that will be called by the server to handle a request
    */
-<<<<<<< HEAD
   typedef std::function<void(HTTPRequest *, HTTPResponse *)> HTTPSCallbackFunction;
-=======
-  typedef void (HTTPSCallbackFunction)(HTTPRequest * req, HTTPResponse * res); 
->>>>>>> upstream/pr/162
 }
 
 #endif /* SRC_HTTPSCALLBACKFUNCTION_HPP_ */