Namespace cleanup for #52

Author: wravery

README.md

@@ -38,9 +38,9 @@ exposes an instance of [GraphiQL](https://github.com/graphql/graphiql) on top of
 
 ## Installation process
 
-I've tested this on Windows with Visual Studio 2019 and Linux using an Ubuntu 18.04 LTS instance running in WSL with
-both gcc 7.3.0 and clang 6.0.0. The key compiler requirement is support for C++17, recent updates to Visual Studio 2017
-will probably work too.
+I've tested this on Windows with both Visual Studio 2017 and 2019, and on Linux using an Ubuntu 18.04 LTS instance running in
+WSL with both gcc 7.3.0 and clang 6.0.0. The key compiler requirement is support for C++17, earlier versions of gcc and clang
+may not have enough support for that.
 
 The easiest way to get all of these and to build `cppgraphqlgen` in one step is to use
 [Microsoft/vcpkg](https://github.com/Microsoft/vcpkg). To install with vcpkg, make sure you've pulled the latest version
@@ -127,7 +127,7 @@ configuration.
 ## API references
 
 See [GraphQLService.h](include/graphqlservice/GraphQLService.h) for the base types implemented in
-the `facebook::graphql::service` namespace. Take a look at [UnifiedToday.h](samples/today/UnifiedToday.h) and
+the `graphql::service` namespace. Take a look at [UnifiedToday.h](samples/today/UnifiedToday.h) and
 [UnifiedToday.cpp](samples/today/UnifiedToday.cpp) to see a sample implementation of a custom schema defined
 in [schema.today.graphql](samples/today/schema.today.graphql) for testing purposes.
 

include/SchemaGenerator.h

@@ -9,7 +9,7 @@
 #include <array>
 #include <cstdio>
 
-namespace facebook::graphql::schema {
+namespace graphql::schema {
 
 // These are the set of built-in types in GraphQL.
 enum class BuiltinType
@@ -384,4 +384,4 @@ class Generator
 	OperationTypeList _operationTypes;
 };
 
-} /* namespace facebook::graphql::schema */
+} /* namespace graphql::schema */

include/graphqlservice/GraphQLGrammar.h

@@ -15,7 +15,7 @@
 
 #include <functional>
 
-namespace facebook::graphql::peg {
+namespace graphql::peg {
 
 using namespace tao::graphqlpeg;
 
@@ -1315,4 +1315,4 @@ struct document
 {
 };
 
-} /* namespace facebook::graphql::peg */
+} /* namespace graphql::peg */

include/graphqlservice/GraphQLParse.h

@@ -6,7 +6,7 @@
 #include <memory>
 #include <string_view>
 
-namespace facebook::graphql {
+namespace graphql {
 namespace peg {
 
 struct ast_node;
@@ -25,4 +25,4 @@ ast parseFile(std::string_view filename);
 
 peg::ast operator "" _graphql(const char* text, size_t size);
 
-} /* namespace facebook::graphql */
+} /* namespace graphql */

include/graphqlservice/GraphQLResponse.h

@@ -8,7 +8,7 @@
 #include <vector>
 #include <unordered_map>
 
-namespace facebook::graphql::response {
+namespace graphql::response {
 
 // GraphQL responses are not technically JSON-specific, although that is probably the most common
 // way of representing them. These are the primitive types that may be represented in GraphQL, as
@@ -101,4 +101,4 @@ struct Value
 	std::unique_ptr<TypedData> _data;
 };
 
-} /* namespace facebook::graphql::response */
+} /* namespace graphql::response */

include/graphqlservice/GraphQLService.h

@@ -23,7 +23,7 @@
 #include <map>
 #include <set>
 
-namespace facebook::graphql::service {
+namespace graphql::service {
 
 // This exception bubbles up 1 or more error messages to the JSON results.
 class schema_exception : public std::exception
@@ -48,6 +48,8 @@ struct RequestState : std::enable_shared_from_this<RequestState>
 {
 };
 
+namespace {
+
 using namespace std::literals;
 
 constexpr std::string_view strData{ "data"sv };
@@ -57,6 +59,8 @@ constexpr std::string_view strQuery{ "query"sv };
 constexpr std::string_view strMutation{ "mutation"sv };
 constexpr std::string_view strSubscription{ "subscription"sv };
 
+}
+
 // Pass a common bundle of parameters to all of the generated Object::getField accessors in a SelectionSet
 struct SelectionSetParams
 {
@@ -707,4 +711,4 @@ class Request : public std::enable_shared_from_this<Request>
 	SubscriptionKey _nextKey = 0;
 };
 
-} /* namespace facebook::graphql::service */
+} /* namespace graphql::service */

include/graphqlservice/GraphQLTree.h

@@ -12,7 +12,7 @@
 #include <variant>
 #include <vector>
 
-namespace facebook::graphql::peg {
+namespace graphql::peg {
 
 using namespace tao::graphqlpeg;
 
@@ -26,4 +26,4 @@ struct ast_input
 	std::variant<std::vector<char>, std::unique_ptr<file_input<>>, std::string_view> data;
 };
 
-} /* namespace facebook::graphql::peg */
+} /* namespace graphql::peg */

include/graphqlservice/Introspection.h

@@ -5,7 +5,7 @@
 
 #include <graphqlservice/IntrospectionSchema.h>
 
-namespace facebook::graphql::introspection {
+namespace graphql::introspection {
 
 class Schema;
 class Directive;
@@ -272,4 +272,4 @@ class Directive : public object::Directive
 	const std::vector<std::shared_ptr<InputValue>> _args;
 };
 
-} /* namespace facebook::graphql::introspection */
+} /* namespace graphql::introspection */

include/graphqlservice/JSONResponse.h

@@ -5,10 +5,10 @@
 
 #include <graphqlservice/GraphQLResponse.h>
 
-namespace facebook::graphql::response {
+namespace graphql::response {
 
 std::string toJSON(Value&& response);
 
 Value parseJSON(const std::string& json);
 
-} /* namespace facebook::graphql::response */
+} /* namespace graphql::response */

samples/introspection/IntrospectionSchema.cpp

@@ -10,7 +10,7 @@
 #include <exception>
 #include <array>
 
-namespace facebook::graphql {
+namespace graphql {
 namespace service {
 
 static const std::array<std::string_view, 8> s_namesTypeKind = {
@@ -592,4 +592,4 @@ void AddTypesToSchema(std::shared_ptr<introspection::Schema> schema)
 }
 
 } /* namespace introspection */
-} /* namespace facebook::graphql */
+} /* namespace graphql */