Skip to content

Commit 06cd005

Browse files
glynosglynos
committed
Updated build scripts so as not to build the old client and server; added a basic test fixture for the client.
1 parent 72ea85e commit 06cd005

File tree

15 files changed

+375
-414
lines changed

15 files changed

+375
-414
lines changed

‎CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -149,14 +149,14 @@ if(CPP-NETLIB_BUILD_SINGLE_LIB)
149149
endif()
150150

151151
add_subdirectory(uri)
152-
add_subdirectory(message)
153-
add_subdirectory(logging)
154-
add_subdirectory(concurrency)
152+
#add_subdirectory(message)
153+
#add_subdirectory(logging)
154+
#add_subdirectory(concurrency)
155155
add_subdirectory(http)
156156
#add_subdirectory(mime)
157-
if(CPP-NETLIB_BUILD_EXAMPLES)
158-
add_subdirectory(contrib/http_examples)
159-
endif()
157+
#if(CPP-NETLIB_BUILD_EXAMPLES)
158+
# add_subdirectory(contrib/http_examples)
159+
#endif()
160160

161161
if(CPP-NETLIB_BUILD_SINGLE_LIB)
162162
add_library(cppnetlib

‎http/src/CMakeLists.txt

Lines changed: 110 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -18,92 +18,105 @@ include_directories(
1818
if (OPENSSL_FOUND)
1919
include_directories(${OPENSSL_INCLUDE_DIR})
2020
endif()
21-
22-
set(CPP-NETLIB_HTTP_MESSAGE_SRCS
23-
http/request.cpp
24-
http/response.cpp)
25-
26-
if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)
27-
add_library(cppnetlib-http-message ${CPP-NETLIB_HTTP_MESSAGE_SRCS})
28-
add_dependencies(cppnetlib-http-message
29-
cppnetlib-message)
30-
target_link_libraries(cppnetlib-http-message
31-
${Boost_LIBRARIES}
32-
cppnetlib-message)
33-
endif()
34-
35-
set(CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS
36-
http/message/wrappers.cpp)
37-
38-
if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)
39-
add_library(cppnetlib-http-message-wrappers ${CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS})
40-
endif()
41-
42-
set(CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS
43-
http/client_connections.cpp
44-
http/simple_connection_manager.cpp
45-
http/simple_connection_factory.cpp
46-
http/connection_delegate_factory.cpp
47-
http/client_resolver_delegate.cpp
48-
http/client_resolver_delegate_factory.cpp
49-
http/client_connection_delegates.cpp
50-
http/client_connection_factory.cpp
51-
http/client_async_resolver.cpp
52-
http/client_connection_normal.cpp)
53-
54-
if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)
55-
add_library(cppnetlib-http-client-connections ${CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS})
56-
endif()
57-
58-
set(CPP-NETLIB_CONSTANTS_SRCS
59-
constants.cpp)
60-
61-
if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)
62-
add_library(cppnetlib-constants ${CPP-NETLIB_CONSTANTS_SRCS})
63-
endif()
64-
65-
# Server implementation files.
66-
set(CPP-NETLIB_HTTP_SERVER_SRCS
67-
http/server/session.cpp
68-
http/server/simple_sessions.cpp
69-
http/server/dynamic_dispatcher.cpp)
70-
71-
if (NOT CPP-NETLIB_BUILD_SINGLE_LIB)
72-
add_library(cppnetlib-http-server ${CPP-NETLIB_HTTP_SERVER_SRCS})
73-
endif()
74-
75-
set(CPP-NETLIB_HTTP_CLIENT_SRCS
76-
http/client.cpp)
77-
78-
if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)
79-
add_library(cppnetlib-http-client ${CPP-NETLIB_HTTP_CLIENT_SRCS})
80-
add_dependencies(cppnetlib-http-client
81-
${CPP-NETLIB_LOGGING_LIB}
82-
cppnetlib-constants
83-
cppnetlib-uri
84-
cppnetlib-message
85-
cppnetlib-message-wrappers
86-
cppnetlib-message-directives
87-
cppnetlib-http-message
88-
cppnetlib-http-message-wrappers
89-
cppnetlib-http-client-connections
90-
)
91-
target_link_libraries(cppnetlib-http-client
92-
${Boost_LIBRARIES}
93-
${CPP-NETLIB_LOGGING_LIB}
94-
cppnetlib-constants
95-
cppnetlib-uri
96-
cppnetlib-message
97-
cppnetlib-message-wrappers
98-
cppnetlib-message-directives
99-
cppnetlib-http-message
100-
cppnetlib-http-message-wrappers
101-
cppnetlib-http-client-connections
102-
)
103-
endif()
21+
#
22+
#set(CPP-NETLIB_HTTP_MESSAGE_SRCS
23+
# http/request.cpp
24+
# http/response.cpp)
25+
#
26+
#if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)
27+
# add_library(cppnetlib-http-message ${CPP-NETLIB_HTTP_MESSAGE_SRCS})
28+
# add_dependencies(cppnetlib-http-message
29+
# cppnetlib-message)
30+
# target_link_libraries(cppnetlib-http-message
31+
# ${Boost_LIBRARIES}
32+
# cppnetlib-message)
33+
#endif()
34+
#
35+
#set(CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS
36+
# http/message/wrappers.cpp)
37+
#
38+
#if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)
39+
# add_library(cppnetlib-http-message-wrappers ${CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS})
40+
#endif()
41+
#
42+
#set(CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS
43+
# http/client_connections.cpp
44+
# http/simple_connection_manager.cpp
45+
# http/simple_connection_factory.cpp
46+
# http/connection_delegate_factory.cpp
47+
# http/client_resolver_delegate.cpp
48+
# http/client_resolver_delegate_factory.cpp
49+
# http/client_connection_delegates.cpp
50+
# http/client_connection_factory.cpp
51+
# http/client_async_resolver.cpp
52+
# http/client_connection_normal.cpp)
53+
#
54+
#if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)
55+
# add_library(cppnetlib-http-client-connections ${CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS})
56+
#endif()
57+
#
58+
#set(CPP-NETLIB_CONSTANTS_SRCS
59+
# constants.cpp)
60+
#
61+
#if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)
62+
# add_library(cppnetlib-constants ${CPP-NETLIB_CONSTANTS_SRCS})
63+
#endif()
64+
#
65+
## Server implementation files.
66+
#set(CPP-NETLIB_HTTP_SERVER_SRCS
67+
# http/server/session.cpp
68+
# http/server/simple_sessions.cpp
69+
# http/server/dynamic_dispatcher.cpp)
70+
#
71+
#if (NOT CPP-NETLIB_BUILD_SINGLE_LIB)
72+
# add_library(cppnetlib-http-server ${CPP-NETLIB_HTTP_SERVER_SRCS})
73+
#endif()
74+
#
75+
#set(CPP-NETLIB_HTTP_CLIENT_SRCS
76+
# http/client.cpp)
77+
#
78+
#if(NOT CPP-NETLIB_BUILD_SINGLE_LIB)
79+
# add_library(cppnetlib-http-client ${CPP-NETLIB_HTTP_CLIENT_SRCS})
80+
# add_dependencies(cppnetlib-http-client
81+
# ${CPP-NETLIB_LOGGING_LIB}
82+
# cppnetlib-constants
83+
# cppnetlib-uri
84+
# cppnetlib-message
85+
# cppnetlib-message-wrappers
86+
# cppnetlib-message-directives
87+
# cppnetlib-http-message
88+
# cppnetlib-http-message-wrappers
89+
# cppnetlib-http-client-connections
90+
# )
91+
# target_link_libraries(cppnetlib-http-client
92+
# ${Boost_LIBRARIES}
93+
# ${CPP-NETLIB_LOGGING_LIB}
94+
# cppnetlib-constants
95+
# cppnetlib-uri
96+
# cppnetlib-message
97+
# cppnetlib-message-wrappers
98+
# cppnetlib-message-directives
99+
# cppnetlib-http-message
100+
# cppnetlib-http-message-wrappers
101+
# cppnetlib-http-client-connections
102+
# )
103+
#endif()
104+
105+
set(CPP-NETLIB_HTTP_CONSTANTS-V2_SRCS
106+
${CMAKE_CURRENT_SOURCE_DIR}/http/v2/constants.cpp
107+
)
108+
add_library(network-http-constants-v2 ${CPP-NETLIB_HTTP_CONSTANTS-V2_SRCS})
109+
add_dependencies(network-http-constants-v2
110+
cppnetlib-uri
111+
)
112+
target_link_libraries(network-http-constants-v2
113+
${Boost_LIBRARIES}
114+
cppnetlib-uri
115+
)
104116

105117
set(CPP-NETLIB_HTTP_CLIENT-V2_SRCS
106-
${CMAKE_CURRENT_SOURCE_DIR}/http/v2/constants.cpp)
118+
${CMAKE_CURRENT_SOURCE_DIR}/http/v2/client/client.cpp
119+
)
107120
add_library(network-http-client-v2 ${CPP-NETLIB_HTTP_CLIENT-V2_SRCS})
108121
add_dependencies(network-http-client-v2
109122
cppnetlib-uri
@@ -115,20 +128,20 @@ target_link_libraries(network-http-client-v2
115128

116129
# prepend current directory to make paths absolute
117130
prependToElements( "${CMAKE_CURRENT_SOURCE_DIR}/"
118-
CPP-NETLIB_HTTP_MESSAGE_SRCS
119-
CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS
120-
CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS
121-
CPP-NETLIB_CONSTANTS_SRCS
122-
CPP-NETLIB_HTTP_SERVER_SRCS
123-
CPP-NETLIB_HTTP_CLIENT_SRCS
131+
# CPP-NETLIB_HTTP_MESSAGE_SRCS
132+
# CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS
133+
# CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS
134+
# CPP-NETLIB_CONSTANTS_SRCS
135+
# CPP-NETLIB_HTTP_SERVER_SRCS
136+
# CPP-NETLIB_HTTP_CLIENT_SRCS
124137
CPP-NETLIB_HTTP_CLIENT-V2_SRCS )
125138

126139

127-
# propagate sources to parent directory for one-lib-build
128-
set(CPP-NETLIB_HTTP_MESSAGE_SRCS ${CPP-NETLIB_HTTP_MESSAGE_SRCS} PARENT_SCOPE)
129-
set(CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS ${CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS} PARENT_SCOPE)
130-
set(CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS ${CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS} PARENT_SCOPE)
131-
set(CPP-NETLIB_HTTP_CLIENT_SRCS ${CPP-NETLIB_HTTP_CLIENT_SRCS} PARENT_SCOPE)
132-
set(CPP-NETLIB_HTTP_SERVER_SRCS ${CPP-NETLIB_HTTP_SERVER_SRCS} PARENT_SCOPE)
133-
set(CPP-NETLIB_CONSTANTS_SRCS ${CPP-NETLIB_CONSTANTS_SRCS} PARENT_SCOPE)
140+
## propagate sources to parent directory for one-lib-build
141+
#set(CPP-NETLIB_HTTP_MESSAGE_SRCS ${CPP-NETLIB_HTTP_MESSAGE_SRCS} PARENT_SCOPE)
142+
#set(CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS ${CPP-NETLIB_HTTP_MESSAGE_WRAPPERS_SRCS} PARENT_SCOPE)
143+
#set(CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS ${CPP-NETLIB_HTTP_CLIENT_CONNECTIONS_SRCS} PARENT_SCOPE)
144+
#set(CPP-NETLIB_HTTP_CLIENT_SRCS ${CPP-NETLIB_HTTP_CLIENT_SRCS} PARENT_SCOPE)
145+
#set(CPP-NETLIB_HTTP_SERVER_SRCS ${CPP-NETLIB_HTTP_SERVER_SRCS} PARENT_SCOPE)
146+
#set(CPP-NETLIB_CONSTANTS_SRCS ${CPP-NETLIB_CONSTANTS_SRCS} PARENT_SCOPE)
134147
set(CPP-NETLIB_HTTP_CLIENT-V2_SRCS ${CPP-NETLIB_HTTP_CLIENT-V2_SRCS} PARENT SCOPE)

‎http/src/http/v2/client/client.cpp

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
// Copyright (C) 2013 by Glyn Matthews
2+
// Distributed under the Boost Software License, Version 1.0.
3+
// (See accompanying file LICENSE_1_0.txt or copy at
4+
// http://www.boost.org/LICENSE_1_0.txt)
5+
6+
#include <network/http/v2/client/client.hpp>
7+
8+
namespace network {
9+
namespace http {
10+
namespace v2 {
11+
client::client() {
12+
13+
}
14+
15+
std::future<response> client::get(const request &req) {
16+
return std::future<response>();
17+
}
18+
19+
std::future<response> client::post(const request &req) {
20+
return std::future<response>();
21+
}
22+
23+
std::future<response> client::put(const request &req) {
24+
return std::future<response>();
25+
}
26+
27+
std::future<response> client::delete_(const request &req) {
28+
return std::future<response>();
29+
}
30+
31+
std::future<response> client::head(const request &req) {
32+
return std::future<response>();
33+
}
34+
} // namespace v2
35+
} // namespace network
36+
} // namespace network

‎http/test/v2/client/connection_manager_test.cpp renamed to ‎http/src/network/http/v2/client.hpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,9 @@
33
// (See accompanying file LICENSE_1_0.txt or copy at
44
// http://www.boost.org/LICENSE_1_0.txt)
55

6-
#include <gtest/gtest.h>
6+
#ifndef __NETWORK_HTTP_V2_CLIENT_INC__
7+
#define __NETWORK_HTTP_V2_CLIENT_INC__
78

9+
#include <network/http/v2/client/client.hpp>
10+
11+
#endif // __NETWORK_HTTP_V2_CLIENT_INC__

‎http/src/network/http/v2/client/client.hpp

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@
33
// (See accompanying file LICENSE_1_0.txt or copy at
44
// http://www.boost.org/LICENSE_1_0.txt)
55

6-
#ifndef __NETWORK_HTTP_V2_CLIENT_INC__
7-
#define __NETWORK_HTTP_V2_CLIENT_INC__
6+
#ifndef __NETWORK_HTTP_V2_CLIENT_CLIENT_INC__
7+
#define __NETWORK_HTTP_V2_CLIENT_CLIENT_INC__
88

9-
#include <cstdint>
9+
#include <network/http/v2/client/request.hpp>
10+
#include <network/http/v2/client/response.hpp>
11+
#include <future>
1012

1113
namespace network {
1214
namespace http {
@@ -15,13 +17,23 @@ namespace network {
1517

1618
public:
1719

18-
client() { }
20+
client();
1921
client(client const &) = delete;
2022
client(client &&) = delete;
2123

24+
std::future<response> get(const request &req);
25+
26+
std::future<response> post(const request &req);
27+
28+
std::future<response> put(const request &req);
29+
30+
std::future<response> delete_(const request &req);
31+
32+
std::future<response> head(const request &req);
33+
2234
};
2335
} // namespace v2
2436
} // namespace http
2537
} // namespace network
2638

27-
#endif // __NETWORK_HTTP_V2_CLIENT_INC__
39+
#endif // __NETWORK_HTTP_V2_CLIENT_CLIENT_INC__

‎http/src/network/http/v2/client/connection_manager.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ namespace network {
2828

2929
connection_manager &operator = (const connection_manager &) = delete;
3030

31-
virtual connection_manager() = default;
31+
virtual connection_manager() = default noexcept;
3232

33-
virtual std::shared_ptr<client_connection> get_connection(boost::asio::io_service &io_service,
34-
const request &req,
35-
const client_options &options) = 0;
33+
virtual std::shared_ptr<connection> get_connection(boost::asio::io_service &io_service,
34+
const request &req,
35+
const client_options &options) = 0;
3636

3737
virtual void clear_resolved_cache() = 0;
3838

‎http/src/network/http/v2/client/request.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <memory>
1111
#include <string>
1212
#include <network/http/v2/message_base.hpp>
13-
#include <network/http/v2/url.hpp>
13+
#include <network/uri.hpp>
1414

1515
namespace network {
1616
namespace http {
@@ -50,7 +50,7 @@ namespace network {
5050

5151
public:
5252

53-
request(url locator, std::shared_ptr<byte_source> source = nullptr)
53+
request(uri locator, std::shared_ptr<byte_source> source = nullptr)
5454
: locator_(locator), source_(source) { }
5555

5656
request(const request &other)
@@ -84,7 +84,7 @@ namespace network {
8484
// uri
8585
// version
8686

87-
url locator_;
87+
uri locator_;
8888
std::shared_ptr<byte_source> source_;
8989

9090
};

0 commit comments

Comments
 (0)