Permalink
Browse files

collection, break: deprecated collection module and Map object.

  • Loading branch information...
xicilion committed Oct 31, 2017
1 parent 1f62211 commit 590b76a47fcfee54bd62bf68806836e8705b0277
View
@@ -134,7 +134,6 @@
<ClInclude Include="include\LevelDB.h" />
<ClInclude Include="include\Lock.h" />
<ClInclude Include="include\LruCache.h" />
<ClInclude Include="include\Map.h" />
<ClInclude Include="include\MemoryStream.h" />
<ClInclude Include="include\Message.h" />
<ClInclude Include="include\MongoCollection.h" />
@@ -203,7 +202,6 @@
<ClInclude Include="include\encoding_bson.h" />
<ClInclude Include="include\encoding_iconv.h" />
<ClInclude Include="include\ifs\AsyncWait.h" />
<ClInclude Include="include\ifs\BlockQueue.h" />
<ClInclude Include="include\ifs\Buffer.h" />
<ClInclude Include="include\ifs\BufferedStream.h" />
<ClInclude Include="include\ifs\Chain.h" />
@@ -235,11 +233,9 @@
<ClInclude Include="include\ifs\Image.h" />
<ClInclude Include="include\ifs\Int64.h" />
<ClInclude Include="include\ifs\LevelDB.h" />
<ClInclude Include="include\ifs\List.h" />
<ClInclude Include="include\ifs\Lock.h" />
<ClInclude Include="include\ifs\LruCache.h" />
<ClInclude Include="include\ifs\MSSQL.h" />
<ClInclude Include="include\ifs\Map.h" />
<ClInclude Include="include\ifs\MemoryStream.h" />
<ClInclude Include="include\ifs\Message.h" />
<ClInclude Include="include\ifs\MongoCollection.h" />
@@ -248,7 +244,6 @@
<ClInclude Include="include\ifs\MongoID.h" />
<ClInclude Include="include\ifs\MySQL.h" />
<ClInclude Include="include\ifs\PKey.h" />
<ClInclude Include="include\ifs\Queue.h" />
<ClInclude Include="include\ifs\Redis.h" />
<ClInclude Include="include\ifs\RedisHash.h" />
<ClInclude Include="include\ifs\RedisList.h" />
@@ -271,7 +266,6 @@
<ClInclude Include="include\ifs\StringDecoder.h" />
<ClInclude Include="include\ifs\SubProcess.h" />
<ClInclude Include="include\ifs\TcpServer.h" />
<ClInclude Include="include\ifs\TextColor.h" />
<ClInclude Include="include\ifs\Timer.h" />
<ClInclude Include="include\ifs\UrlObject.h" />
<ClInclude Include="include\ifs\WebSocket.h" />
@@ -301,7 +295,6 @@
<ClInclude Include="include\ifs\base64.h" />
<ClInclude Include="include\ifs\base64vlq.h" />
<ClInclude Include="include\ifs\bson.h" />
<ClInclude Include="include\ifs\collection.h" />
<ClInclude Include="include\ifs\console.h" />
<ClInclude Include="include\ifs\coroutine.h" />
<ClInclude Include="include\ifs\crypto.h" />
@@ -378,7 +371,6 @@
<ClCompile Include="src\base\utf8.cpp" />
<ClCompile Include="src\base\utils.cpp" />
<ClCompile Include="src\base\v8_api.cpp" />
<ClCompile Include="src\collection\Map.cpp" />
<ClCompile Include="src\console\console.cpp" />
<ClCompile Include="src\console\console_event.cpp" />
<ClCompile Include="src\console\console_file.cpp" />
@@ -13,9 +13,6 @@
<Filter Include="Source Files\base">
<UniqueIdentifier>{68529cf3-5a67-0bb1-84a4-c91e13c58f94}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\collection">
<UniqueIdentifier>{526be7f6-9823-913f-3aa4-88e3930cd372}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\console">
<UniqueIdentifier>{4ffaa5dd-04e3-091a-71af-ccd4a8994f62}</UniqueIdentifier>
</Filter>
@@ -243,9 +240,6 @@
<ClInclude Include="include\LruCache.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Map.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\MemoryStream.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -450,9 +444,6 @@
<ClInclude Include="include\ifs\AsyncWait.h">
<Filter>Header Files\ifs</Filter>
</ClInclude>
<ClInclude Include="include\ifs\BlockQueue.h">
<Filter>Header Files\ifs</Filter>
</ClInclude>
<ClInclude Include="include\ifs\Buffer.h">
<Filter>Header Files\ifs</Filter>
</ClInclude>
@@ -546,9 +537,6 @@
<ClInclude Include="include\ifs\LevelDB.h">
<Filter>Header Files\ifs</Filter>
</ClInclude>
<ClInclude Include="include\ifs\List.h">
<Filter>Header Files\ifs</Filter>
</ClInclude>
<ClInclude Include="include\ifs\Lock.h">
<Filter>Header Files\ifs</Filter>
</ClInclude>
@@ -558,9 +546,6 @@
<ClInclude Include="include\ifs\MSSQL.h">
<Filter>Header Files\ifs</Filter>
</ClInclude>
<ClInclude Include="include\ifs\Map.h">
<Filter>Header Files\ifs</Filter>
</ClInclude>
<ClInclude Include="include\ifs\MemoryStream.h">
<Filter>Header Files\ifs</Filter>
</ClInclude>
@@ -585,9 +570,6 @@
<ClInclude Include="include\ifs\PKey.h">
<Filter>Header Files\ifs</Filter>
</ClInclude>
<ClInclude Include="include\ifs\Queue.h">
<Filter>Header Files\ifs</Filter>
</ClInclude>
<ClInclude Include="include\ifs\Redis.h">
<Filter>Header Files\ifs</Filter>
</ClInclude>
@@ -654,9 +636,6 @@
<ClInclude Include="include\ifs\TcpServer.h">
<Filter>Header Files\ifs</Filter>
</ClInclude>
<ClInclude Include="include\ifs\TextColor.h">
<Filter>Header Files\ifs</Filter>
</ClInclude>
<ClInclude Include="include\ifs\Timer.h">
<Filter>Header Files\ifs</Filter>
</ClInclude>
@@ -744,9 +723,6 @@
<ClInclude Include="include\ifs\bson.h">
<Filter>Header Files\ifs</Filter>
</ClInclude>
<ClInclude Include="include\ifs\collection.h">
<Filter>Header Files\ifs</Filter>
</ClInclude>
<ClInclude Include="include\ifs\console.h">
<Filter>Header Files\ifs</Filter>
</ClInclude>
@@ -962,9 +938,6 @@
<ClCompile Include="src\base\v8_api.cpp">
<Filter>Source Files\base</Filter>
</ClCompile>
<ClCompile Include="src\collection\Map.cpp">
<Filter>Source Files\collection</Filter>
</ClCompile>
<ClCompile Include="src\console\console.cpp">
<Filter>Source Files\console</Filter>
</ClCompile>
View
@@ -134,7 +134,6 @@
<ClInclude Include="include\LevelDB.h" />
<ClInclude Include="include\Lock.h" />
<ClInclude Include="include\LruCache.h" />
<ClInclude Include="include\Map.h" />
<ClInclude Include="include\MemoryStream.h" />
<ClInclude Include="include\Message.h" />
<ClInclude Include="include\MongoCollection.h" />
@@ -203,7 +202,6 @@
<ClInclude Include="include\encoding_bson.h" />
<ClInclude Include="include\encoding_iconv.h" />
<ClInclude Include="include\ifs\AsyncWait.h" />
<ClInclude Include="include\ifs\BlockQueue.h" />
<ClInclude Include="include\ifs\Buffer.h" />
<ClInclude Include="include\ifs\BufferedStream.h" />
<ClInclude Include="include\ifs\Chain.h" />
@@ -235,11 +233,9 @@
<ClInclude Include="include\ifs\Image.h" />
<ClInclude Include="include\ifs\Int64.h" />
<ClInclude Include="include\ifs\LevelDB.h" />
<ClInclude Include="include\ifs\List.h" />
<ClInclude Include="include\ifs\Lock.h" />
<ClInclude Include="include\ifs\LruCache.h" />
<ClInclude Include="include\ifs\MSSQL.h" />
<ClInclude Include="include\ifs\Map.h" />
<ClInclude Include="include\ifs\MemoryStream.h" />
<ClInclude Include="include\ifs\Message.h" />
<ClInclude Include="include\ifs\MongoCollection.h" />
@@ -248,7 +244,6 @@
<ClInclude Include="include\ifs\MongoID.h" />
<ClInclude Include="include\ifs\MySQL.h" />
<ClInclude Include="include\ifs\PKey.h" />
<ClInclude Include="include\ifs\Queue.h" />
<ClInclude Include="include\ifs\Redis.h" />
<ClInclude Include="include\ifs\RedisHash.h" />
<ClInclude Include="include\ifs\RedisList.h" />
@@ -271,7 +266,6 @@
<ClInclude Include="include\ifs\StringDecoder.h" />
<ClInclude Include="include\ifs\SubProcess.h" />
<ClInclude Include="include\ifs\TcpServer.h" />
<ClInclude Include="include\ifs\TextColor.h" />
<ClInclude Include="include\ifs\Timer.h" />
<ClInclude Include="include\ifs\UrlObject.h" />
<ClInclude Include="include\ifs\WebSocket.h" />
@@ -301,7 +295,6 @@
<ClInclude Include="include\ifs\base64.h" />
<ClInclude Include="include\ifs\base64vlq.h" />
<ClInclude Include="include\ifs\bson.h" />
<ClInclude Include="include\ifs\collection.h" />
<ClInclude Include="include\ifs\console.h" />
<ClInclude Include="include\ifs\coroutine.h" />
<ClInclude Include="include\ifs\crypto.h" />
@@ -378,7 +371,6 @@
<ClCompile Include="src\base\utf8.cpp" />
<ClCompile Include="src\base\utils.cpp" />
<ClCompile Include="src\base\v8_api.cpp" />
<ClCompile Include="src\collection\Map.cpp" />
<ClCompile Include="src\console\console.cpp" />
<ClCompile Include="src\console\console_event.cpp" />
<ClCompile Include="src\console\console_file.cpp" />
@@ -13,9 +13,6 @@
<Filter Include="Source Files\base">
<UniqueIdentifier>{68529cf3-5a67-0bb1-84a4-c91e13c58f94}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\collection">
<UniqueIdentifier>{526be7f6-9823-913f-3aa4-88e3930cd372}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\console">
<UniqueIdentifier>{4ffaa5dd-04e3-091a-71af-ccd4a8994f62}</UniqueIdentifier>
</Filter>
@@ -243,9 +240,6 @@
<ClInclude Include="include\LruCache.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Map.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\MemoryStream.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -450,9 +444,6 @@
<ClInclude Include="include\ifs\AsyncWait.h">
<Filter>Header Files\ifs</Filter>
</ClInclude>
<ClInclude Include="include\ifs\BlockQueue.h">
<Filter>Header Files\ifs</Filter>
</ClInclude>
<ClInclude Include="include\ifs\Buffer.h">
<Filter>Header Files\ifs</Filter>
</ClInclude>
@@ -546,9 +537,6 @@
<ClInclude Include="include\ifs\LevelDB.h">
<Filter>Header Files\ifs</Filter>
</ClInclude>
<ClInclude Include="include\ifs\List.h">
<Filter>Header Files\ifs</Filter>
</ClInclude>
<ClInclude Include="include\ifs\Lock.h">
<Filter>Header Files\ifs</Filter>
</ClInclude>
@@ -558,9 +546,6 @@
<ClInclude Include="include\ifs\MSSQL.h">
<Filter>Header Files\ifs</Filter>
</ClInclude>
<ClInclude Include="include\ifs\Map.h">
<Filter>Header Files\ifs</Filter>
</ClInclude>
<ClInclude Include="include\ifs\MemoryStream.h">
<Filter>Header Files\ifs</Filter>
</ClInclude>
@@ -585,9 +570,6 @@
<ClInclude Include="include\ifs\PKey.h">
<Filter>Header Files\ifs</Filter>
</ClInclude>
<ClInclude Include="include\ifs\Queue.h">
<Filter>Header Files\ifs</Filter>
</ClInclude>
<ClInclude Include="include\ifs\Redis.h">
<Filter>Header Files\ifs</Filter>
</ClInclude>
@@ -654,9 +636,6 @@
<ClInclude Include="include\ifs\TcpServer.h">
<Filter>Header Files\ifs</Filter>
</ClInclude>
<ClInclude Include="include\ifs\TextColor.h">
<Filter>Header Files\ifs</Filter>
</ClInclude>
<ClInclude Include="include\ifs\Timer.h">
<Filter>Header Files\ifs</Filter>
</ClInclude>
@@ -744,9 +723,6 @@
<ClInclude Include="include\ifs\bson.h">
<Filter>Header Files\ifs</Filter>
</ClInclude>
<ClInclude Include="include\ifs\collection.h">
<Filter>Header Files\ifs</Filter>
</ClInclude>
<ClInclude Include="include\ifs\console.h">
<Filter>Header Files\ifs</Filter>
</ClInclude>
@@ -962,9 +938,6 @@
<ClCompile Include="src\base\v8_api.cpp">
<Filter>Source Files\base</Filter>
</ClCompile>
<ClCompile Include="src\collection\Map.cpp">
<Filter>Source Files\collection</Filter>
</ClCompile>
<ClCompile Include="src\console\console.cpp">
<Filter>Source Files\console</Filter>
</ClCompile>
@@ -41,7 +41,6 @@ class HttpClient : public HttpClient_base {
virtual result_t set_userAgent(exlib::string newVal);
virtual result_t request(Stream_base* conn, HttpRequest_base* req, obj_ptr<HttpResponse_base>& retVal, AsyncEvent* ac);
virtual result_t request(exlib::string method, exlib::string url, v8::Local<v8::Object> opts, obj_ptr<HttpResponse_base>& retVal, AsyncEvent* ac);
virtual result_t request(exlib::string method, exlib::string url, SeekableStream_base* body, Map_base* headers, obj_ptr<HttpResponse_base>& retVal, AsyncEvent* ac);
virtual result_t get(exlib::string url, v8::Local<v8::Object> headers, obj_ptr<HttpResponse_base>& retVal, AsyncEvent* ac);
virtual result_t post(exlib::string url, v8::Local<v8::Object> headers, obj_ptr<HttpResponse_base>& retVal, AsyncEvent* ac);
virtual result_t del(exlib::string url, v8::Local<v8::Object> headers, obj_ptr<HttpResponse_base>& retVal, AsyncEvent* ac);
@@ -50,7 +49,9 @@ class HttpClient : public HttpClient_base {
virtual result_t find(exlib::string url, v8::Local<v8::Object> headers, obj_ptr<HttpResponse_base>& retVal, AsyncEvent* ac);
public:
result_t update_cookies(exlib::string url, obj_ptr<NArray> cookies);
result_t request(exlib::string method, exlib::string url, SeekableStream_base* body,
NObject* headers, obj_ptr<HttpResponse_base>& retVal, AsyncEvent* ac);
result_t update_cookies(exlib::string url, NArray* cookies);
result_t get_cookie(exlib::string url, exlib::string& retVal);
exlib::string agent()
@@ -59,7 +60,7 @@ class HttpClient : public HttpClient_base {
}
private:
result_t update(obj_ptr<HttpCookie_base> cookie);
result_t update(HttpCookie_base* cookie);
private:
obj_ptr<NArray> m_cookies;
@@ -9,7 +9,6 @@
#include "HttpMessage.h"
#include "HttpResponse.h"
#include "HttpCollection.h"
#include "Map.h"
#ifndef HTTPREQUEST_H_
#define HTTPREQUEST_H_
@@ -87,9 +86,13 @@ class HttpRequest : public HttpRequest_base {
virtual result_t get_query(obj_ptr<HttpCollection_base>& retVal);
public:
result_t addHeader(Map_base* map)
result_t addHeader(NObject* map)
{
return ((Map*)map)->map(this, &HttpRequest::addHeader);
std::map<exlib::string, Variant>::iterator iter;
for (iter = map->m_datas.begin(); iter != map->m_datas.end(); iter++)
addHeader(iter->first, iter->second);
return 0;
}
void header(const char* name, exlib::string& retVal)
Oops, something went wrong.

0 comments on commit 590b76a

Please sign in to comment.