Move the client and server samples to the same directory

wravery · wravery · commit 22dad2c42a31 · 2023-05-09T15:00:25.000-07:00
diff --git a/samples/learn/CMakeLists.txt b/samples/learn/CMakeLists.txt
@@ -14,22 +14,13 @@ add_library(star_wars STATIC
   StarWarsData.cpp)
 target_link_libraries(star_wars PUBLIC learn_schema)
 target_include_directories(star_wars PUBLIC star_wars)
+target_include_directories(star_wars INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
 
 add_executable(learn_star_wars sample.cpp)
 target_link_libraries(learn_star_wars PRIVATE
   star_wars
   graphqljson)
 
-if(GRAPHQL_BUILD_HTTP_SAMPLE)
-  find_package(Boost)
-  if(Boost_FOUND)
-    add_executable(server server.cpp)
-    target_link_libraries(server PRIVATE
-      star_wars
-      graphqljson)
-  endif()
-endif()
-
 if(WIN32 AND BUILD_SHARED_LIBS)
   add_custom_command(OUTPUT copied_sample_dlls
     COMMAND ${CMAKE_COMMAND} -E copy_if_different
@@ -48,8 +39,4 @@ if(WIN32 AND BUILD_SHARED_LIBS)
   add_custom_target(copy_learn_sample_dlls DEPENDS copied_sample_dlls)
 
   add_dependencies(learn_star_wars copy_learn_sample_dlls)
-
-  if(GRAPHQL_BUILD_HTTP_SAMPLE AND Boost_FOUND)
-    add_dependencies(server copy_learn_sample_dlls)
-  endif()
 endif()
diff --git a/samples/proxy/CMakeLists.txt b/samples/proxy/CMakeLists.txt
@@ -3,17 +3,22 @@
 
 cmake_minimum_required(VERSION 3.15)
 
+add_subdirectory(query)
 add_subdirectory(schema)
-add_subdirectory(client)
 
-add_executable(proxy proxy.cpp)
-target_link_libraries(proxy PRIVATE
+add_executable(client client.cpp)
+target_link_libraries(client PRIVATE
   proxy_schema
-  proxyrelay_client
+  proxy_client
+  graphqljson)
+target_include_directories(client PRIVATE
+  proxy_schema
+  proxy_client)
+
+add_executable(server server.cpp)
+target_link_libraries(server PRIVATE
+  star_wars
   graphqljson)
-target_include_directories(proxy PRIVATE
-  client
-  schema)
 
 if(WIN32 AND BUILD_SHARED_LIBS)
   add_custom_command(OUTPUT copied_sample_dlls
@@ -34,5 +39,6 @@ if(WIN32 AND BUILD_SHARED_LIBS)
 
   add_custom_target(copy_proxy_sample_dlls DEPENDS copied_sample_dlls)
 
-  add_dependencies(proxy copy_proxy_sample_dlls)
+  add_dependencies(client copy_proxy_sample_dlls)
+  add_dependencies(server copy_proxy_sample_dlls)
 endif()
diff --git a/samples/proxy/client.cpp b/samples/proxy/client.cpp
@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-#include "HttpProxySchema.h"
-#include "QueryObject.h"
+#include "query/ProxyClient.h"
 
-#include "ProxyRelayClient.h"
+#include "schema/ProxySchema.h"
+#include "schema/QueryObject.h"
 
 #include "graphqlservice/JSONResponse.h"
 
@@ -178,7 +178,6 @@ int main(int argc, char** argv)
 		auto query = GetRequestObject();
 		auto variables = serializeVariables(
 			{ input, ((argc > 1) ? std::make_optional(argv[1]) : std::nullopt) });
-
 		auto launch = service::await_async { std::make_shared<service::await_worker_queue>() };
 		auto serviceResponse = client::parseServiceResponse(
 			service->resolve({ query, GetOperationName(), std::move(variables), launch }).get());
diff --git a/samples/proxy/client/proxyrelay_client_files b/samples/proxy/client/proxyrelay_client_files
diff --git a/samples/proxy/query/CMakeLists.txt b/samples/proxy/query/CMakeLists.txt
@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.15)
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake/cppgraphqlgen-functions.cmake)
 
 if(GRAPHQL_UPDATE_SAMPLES AND GRAPHQL_BUILD_CLIENTGEN)
-  update_graphql_client_files(proxyrelay ../schema/schema.proxy.graphql query.relay.graphql ProxyRelay proxyrelay)
+  update_graphql_client_files(proxy ../schema/schema.graphql query.graphql Proxy proxy)
 endif()
 
-add_graphql_client_target(proxyrelay)
+add_graphql_client_target(proxy)
diff --git a/samples/proxy/query/ProxyClient.cpp b/samples/proxy/query/ProxyClient.cpp
@@ -3,7 +3,7 @@
 
 // WARNING! Do not edit this file manually, your changes will be overwritten.
 
-#include "ProxyRelayClient.h"
+#include "ProxyClient.h"
 
 #include "graphqlservice/internal/SortedMap.h"
 
@@ -17,7 +17,7 @@
 using namespace std::literals;
 
 namespace graphql::client {
-namespace proxyrelay {
+namespace proxy {
 
 const std::string& GetRequestText() noexcept
 {
@@ -47,9 +47,9 @@ const peg::ast& GetRequestObject() noexcept
 	return s_request;
 }
 
-} // namespace proxyrelay
+} // namespace proxy
 
-using namespace proxyrelay;
+using namespace proxy;
 
 namespace query::relayQuery {
 
@@ -94,12 +94,12 @@ Response parseResponse(response::Value&& response)
 
 [[nodiscard]] const std::string& Traits::GetRequestText() noexcept
 {
-	return proxyrelay::GetRequestText();
+	return proxy::GetRequestText();
 }
 
 [[nodiscard]] const peg::ast& Traits::GetRequestObject() noexcept
 {
-	return proxyrelay::GetRequestObject();
+	return proxy::GetRequestObject();
 }
 
 [[nodiscard]] const std::string& Traits::GetOperationName() noexcept
diff --git a/samples/proxy/query/ProxyClient.h b/samples/proxy/query/ProxyClient.h
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#ifndef PROXYRELAYCLIENT_H
-#define PROXYRELAYCLIENT_H
+#ifndef PROXYCLIENT_H
+#define PROXYCLIENT_H
 
 #include "graphqlservice/GraphQLClient.h"
 #include "graphqlservice/GraphQLParse.h"
@@ -35,20 +35,20 @@ namespace graphql::client {
 ///   relay(query: $query, operationName: $operationName, variables: $variables)
 /// }
 /// </code>
-namespace proxyrelay {
+namespace proxy {
 
 // Return the original text of the request document.
 [[nodiscard]] const std::string& GetRequestText() noexcept;
 
 // Return a pre-parsed, pre-validated request object.
 [[nodiscard]] const peg::ast& GetRequestObject() noexcept;
 
-} // namespace proxyrelay
+} // namespace proxy
 
 namespace query::relayQuery {
 
-using proxyrelay::GetRequestText;
-using proxyrelay::GetRequestObject;
+using proxy::GetRequestText;
+using proxy::GetRequestObject;
 
 // Return the name of this operation in the shared request document.
 [[nodiscard]] const std::string& GetOperationName() noexcept;
@@ -87,4 +87,4 @@ struct Traits
 } // namespace query::relayQuery
 } // namespace graphql::client
 
-#endif // PROXYRELAYCLIENT_H
+#endif // PROXYCLIENT_H
diff --git a/samples/proxy/query/proxy_client_files b/samples/proxy/query/proxy_client_files
@@ -0,0 +1 @@
+ProxyClient.cpp
diff --git a/samples/proxy/query/query.graphql b/samples/proxy/query/query.graphql
diff --git a/samples/proxy/schema/CMakeLists.txt b/samples/proxy/schema/CMakeLists.txt
@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.15)
 include(${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake/cppgraphqlgen-functions.cmake)
 
 if(GRAPHQL_UPDATE_SAMPLES)
-  update_graphql_schema_files(proxy schema.proxy.graphql HttpProxy proxy)
+  update_graphql_schema_files(proxy schema.graphql Proxy proxy)
 endif()
 
 add_graphql_schema_target(proxy)
diff --git a/samples/proxy/schema/ProxySchema.cpp b/samples/proxy/schema/ProxySchema.cpp
diff --git a/samples/proxy/schema/ProxySchema.h b/samples/proxy/schema/ProxySchema.h
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#ifndef HTTPPROXYSCHEMA_H
-#define HTTPPROXYSCHEMA_H
+#ifndef PROXYSCHEMA_H
+#define PROXYSCHEMA_H
 
 #include "graphqlservice/internal/Schema.h"
 
@@ -52,4 +52,4 @@ std::shared_ptr<schema::Schema> GetSchema();
 } // namespace proxy
 } // namespace graphql
 
-#endif // HTTPPROXYSCHEMA_H
+#endif // PROXYSCHEMA_H
diff --git a/samples/proxy/schema/QueryObject.h b/samples/proxy/schema/QueryObject.h
@@ -8,7 +8,7 @@
 #ifndef QUERYOBJECT_H
 #define QUERYOBJECT_H
 
-#include "HttpProxySchema.h"
+#include "ProxySchema.h"
 
 namespace graphql::proxy::object {
 namespace methods::QueryHas {
diff --git a/samples/proxy/schema/proxy_schema_files b/samples/proxy/schema/proxy_schema_files
@@ -1,2 +1,2 @@
-HttpProxySchema.cpp
+ProxySchema.cpp
 QueryObject.cpp
diff --git a/samples/proxy/schema/schema.graphql b/samples/proxy/schema/schema.graphql
diff --git a/samples/proxy/server.cpp b/samples/proxy/server.cpp

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`// WARNING! Do not edit this file manually, your changes will be overwritten.`
`5`	`5`
`6`		`-#include "ProxyRelayClient.h"`
	`6`	`+#include "ProxyClient.h"`
`7`	`7`
`8`	`8`	`#include "graphqlservice/internal/SortedMap.h"`
`9`	`9`
`@@ -17,7 +17,7 @@`
`17`	`17`	`using namespace std::literals;`
`18`	`18`
`19`	`19`	`namespace graphql::client {`
`20`		`-namespace proxyrelay {`
	`20`	`+namespace proxy {`
`21`	`21`
`22`	`22`	`const std::string& GetRequestText() noexcept`
`23`	`23`	`{`
`@@ -47,9 +47,9 @@ const peg::ast& GetRequestObject() noexcept`
`47`	`47`	`return s_request;`
`48`	`48`	`}`
`49`	`49`
`50`		`-} // namespace proxyrelay`
	`50`	`+} // namespace proxy`
`51`	`51`
`52`		`-using namespace proxyrelay;`
	`52`	`+using namespace proxy;`
`53`	`53`
`54`	`54`	`namespace query::relayQuery {`
`55`	`55`
`@@ -94,12 +94,12 @@ Response parseResponse(response::Value&& response)`
`94`	`94`
`95`	`95`	`[[nodiscard]] const std::string& Traits::GetRequestText() noexcept`
`96`	`96`	`{`
`97`		`- return proxyrelay::GetRequestText();`
	`97`	`+ return proxy::GetRequestText();`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`[[nodiscard]] const peg::ast& Traits::GetRequestObject() noexcept`
`101`	`101`	`{`
`102`		`- return proxyrelay::GetRequestObject();`
	`102`	`+ return proxy::GetRequestObject();`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`[[nodiscard]] const std::string& Traits::GetOperationName() noexcept`