Skip to content

Commit e8f2f38

Browse files
Shane32Shane32
authored
Change to file-scoped namespaces (#773)
1 parent ce77ad1 commit e8f2f38

File tree

111 files changed

+5526
-5637
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+5526
-5637
lines changed

‎samples/Samples.Schemas.Chat/ChatMutation.cs

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,30 @@
11
using GraphQL.Types;
22

3-
namespace GraphQL.Samples.Schemas.Chat
3+
namespace GraphQL.Samples.Schemas.Chat;
4+
5+
public class ChatMutation : ObjectGraphType<object>
46
{
5-
public class ChatMutation : ObjectGraphType<object>
7+
public ChatMutation(IChat chat)
68
{
7-
public ChatMutation(IChat chat)
8-
{
9-
Field<MessageType>("addMessage",
10-
arguments: new QueryArguments(
11-
new QueryArgument<MessageInputType> { Name = "message" }
12-
),
13-
resolve: context =>
14-
{
15-
var receivedMessage = context.GetArgument<ReceivedMessage>("message");
16-
var message = chat.AddMessage(receivedMessage);
17-
return message;
18-
});
19-
}
9+
Field<MessageType>("addMessage",
10+
arguments: new QueryArguments(
11+
new QueryArgument<MessageInputType> { Name = "message" }
12+
),
13+
resolve: context =>
14+
{
15+
var receivedMessage = context.GetArgument<ReceivedMessage>("message");
16+
var message = chat.AddMessage(receivedMessage);
17+
return message;
18+
});
2019
}
20+
}
2121

22-
public class MessageInputType : InputObjectGraphType
22+
public class MessageInputType : InputObjectGraphType
23+
{
24+
public MessageInputType()
2325
{
24-
public MessageInputType()
25-
{
26-
Field<StringGraphType>("fromId");
27-
Field<StringGraphType>("content");
28-
Field<DateGraphType>("sentAt");
29-
}
26+
Field<StringGraphType>("fromId");
27+
Field<StringGraphType>("content");
28+
Field<DateGraphType>("sentAt");
3029
}
3130
}

‎samples/Samples.Schemas.Chat/ChatQuery.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
using GraphQL.Types;
22

3-
namespace GraphQL.Samples.Schemas.Chat
3+
namespace GraphQL.Samples.Schemas.Chat;
4+
5+
public class ChatQuery : ObjectGraphType
46
{
5-
public class ChatQuery : ObjectGraphType
7+
public ChatQuery(IChat chat)
68
{
7-
public ChatQuery(IChat chat)
8-
{
9-
Field<ListGraphType<MessageType>>("messages", resolve: context => chat.AllMessages.Take(100));
10-
}
9+
Field<ListGraphType<MessageType>>("messages", resolve: context => chat.AllMessages.Take(100));
1110
}
1211
}

‎samples/Samples.Schemas.Chat/ChatSchema.cs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
using GraphQL.Types;
22

3-
namespace GraphQL.Samples.Schemas.Chat
3+
namespace GraphQL.Samples.Schemas.Chat;
4+
5+
public class ChatSchema : Schema
46
{
5-
public class ChatSchema : Schema
7+
public ChatSchema(IChat chat, IServiceProvider provider) : base(provider)
68
{
7-
public ChatSchema(IChat chat, IServiceProvider provider) : base(provider)
8-
{
9-
Query = new ChatQuery(chat);
10-
Mutation = new ChatMutation(chat);
11-
Subscription = new ChatSubscriptions(chat);
12-
}
9+
Query = new ChatQuery(chat);
10+
Mutation = new ChatMutation(chat);
11+
Subscription = new ChatSubscriptions(chat);
1312
}
1413
}

‎samples/Samples.Schemas.Chat/ChatSubscriptions.cs

Lines changed: 48 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -4,67 +4,66 @@
44
using GraphQL.Server.Transports.Subscriptions.Abstractions;
55
using GraphQL.Types;
66

7-
namespace GraphQL.Samples.Schemas.Chat
7+
namespace GraphQL.Samples.Schemas.Chat;
8+
9+
public class ChatSubscriptions : ObjectGraphType<object>
810
{
9-
public class ChatSubscriptions : ObjectGraphType<object>
10-
{
11-
private readonly IChat _chat;
11+
private readonly IChat _chat;
1212

13-
public ChatSubscriptions(IChat chat)
13+
public ChatSubscriptions(IChat chat)
14+
{
15+
_chat = chat;
16+
AddField(new FieldType
1417
{
15-
_chat = chat;
16-
AddField(new FieldType
17-
{
18-
Name = "messageAdded",
19-
Type = typeof(MessageType),
20-
Resolver = new FuncFieldResolver<Message>(ResolveMessage),
21-
StreamResolver = new SourceStreamResolver<Message>(Subscribe)
22-
});
23-
24-
AddField(new FieldType
25-
{
26-
Name = "messageAddedByUser",
27-
Arguments = new QueryArguments(
28-
new QueryArgument<NonNullGraphType<StringGraphType>> { Name = "id" }
29-
),
30-
Type = typeof(MessageType),
31-
Resolver = new FuncFieldResolver<Message>(ResolveMessage),
32-
StreamResolver = new SourceStreamResolver<Message>(SubscribeById)
33-
});
34-
}
18+
Name = "messageAdded",
19+
Type = typeof(MessageType),
20+
Resolver = new FuncFieldResolver<Message>(ResolveMessage),
21+
StreamResolver = new SourceStreamResolver<Message>(Subscribe)
22+
});
3523

36-
private IObservable<Message> SubscribeById(IResolveFieldContext context)
24+
AddField(new FieldType
3725
{
38-
var messageContext = (MessageHandlingContext)context.UserContext;
39-
var user = messageContext.Get<ClaimsPrincipal>("user");
26+
Name = "messageAddedByUser",
27+
Arguments = new QueryArguments(
28+
new QueryArgument<NonNullGraphType<StringGraphType>> { Name = "id" }
29+
),
30+
Type = typeof(MessageType),
31+
Resolver = new FuncFieldResolver<Message>(ResolveMessage),
32+
StreamResolver = new SourceStreamResolver<Message>(SubscribeById)
33+
});
34+
}
4035

41-
string sub = "Anonymous";
42-
if (user != null)
43-
sub = user.Claims.FirstOrDefault(c => c.Type == "sub")?.Value;
36+
private IObservable<Message> SubscribeById(IResolveFieldContext context)
37+
{
38+
var messageContext = (MessageHandlingContext)context.UserContext;
39+
var user = messageContext.Get<ClaimsPrincipal>("user");
4440

45-
var messages = _chat.Messages(sub);
41+
string sub = "Anonymous";
42+
if (user != null)
43+
sub = user.Claims.FirstOrDefault(c => c.Type == "sub")?.Value;
4644

47-
string id = context.GetArgument<string>("id");
48-
return messages.Where(message => message.From.Id == id);
49-
}
45+
var messages = _chat.Messages(sub);
5046

51-
private Message ResolveMessage(IResolveFieldContext context)
52-
{
53-
var message = context.Source as Message;
47+
string id = context.GetArgument<string>("id");
48+
return messages.Where(message => message.From.Id == id);
49+
}
5450

55-
return message;
56-
}
51+
private Message ResolveMessage(IResolveFieldContext context)
52+
{
53+
var message = context.Source as Message;
5754

58-
private IObservable<Message> Subscribe(IResolveFieldContext context)
59-
{
60-
var messageContext = (MessageHandlingContext)context.UserContext;
61-
var user = messageContext.Get<ClaimsPrincipal>("user");
55+
return message;
56+
}
57+
58+
private IObservable<Message> Subscribe(IResolveFieldContext context)
59+
{
60+
var messageContext = (MessageHandlingContext)context.UserContext;
61+
var user = messageContext.Get<ClaimsPrincipal>("user");
6262

63-
string sub = "Anonymous";
64-
if (user != null)
65-
sub = user.Claims.FirstOrDefault(c => c.Type == "sub")?.Value;
63+
string sub = "Anonymous";
64+
if (user != null)
65+
sub = user.Claims.FirstOrDefault(c => c.Type == "sub")?.Value;
6666

67-
return _chat.Messages(sub);
68-
}
67+
return _chat.Messages(sub);
6968
}
7069
}

‎samples/Samples.Schemas.Chat/IChat.cs

Lines changed: 52 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -2,74 +2,73 @@
22
using System.Reactive.Linq;
33
using System.Reactive.Subjects;
44

5-
namespace GraphQL.Samples.Schemas.Chat
5+
namespace GraphQL.Samples.Schemas.Chat;
6+
7+
public interface IChat
68
{
7-
public interface IChat
8-
{
9-
ConcurrentStack<Message> AllMessages { get; }
9+
ConcurrentStack<Message> AllMessages { get; }
1010

11-
Message AddMessage(Message message);
11+
Message AddMessage(Message message);
1212

13-
IObservable<Message> Messages(string user);
13+
IObservable<Message> Messages(string user);
1414

15-
Message AddMessage(ReceivedMessage message);
16-
}
15+
Message AddMessage(ReceivedMessage message);
16+
}
1717

18-
public class Chat : IChat
19-
{
20-
private readonly ISubject<Message> _messageStream = new ReplaySubject<Message>(1);
18+
public class Chat : IChat
19+
{
20+
private readonly ISubject<Message> _messageStream = new ReplaySubject<Message>(1);
2121

22-
public Chat()
22+
public Chat()
23+
{
24+
AllMessages = new ConcurrentStack<Message>();
25+
Users = new ConcurrentDictionary<string, string>
2326
{
24-
AllMessages = new ConcurrentStack<Message>();
25-
Users = new ConcurrentDictionary<string, string>
26-
{
27-
["1"] = "developer",
28-
["2"] = "tester"
29-
};
30-
}
27+
["1"] = "developer",
28+
["2"] = "tester"
29+
};
30+
}
3131

32-
public ConcurrentDictionary<string, string> Users { get; set; }
32+
public ConcurrentDictionary<string, string> Users { get; set; }
3333

34-
public ConcurrentStack<Message> AllMessages { get; }
34+
public ConcurrentStack<Message> AllMessages { get; }
3535

36-
public Message AddMessage(ReceivedMessage message)
36+
public Message AddMessage(ReceivedMessage message)
37+
{
38+
if (!Users.TryGetValue(message.FromId, out string displayName))
3739
{
38-
if (!Users.TryGetValue(message.FromId, out string displayName))
39-
{
40-
displayName = "(unknown)";
41-
}
42-
43-
return AddMessage(new Message
44-
{
45-
Content = message.Content,
46-
SentAt = message.SentAt ?? DateTime.UtcNow,
47-
From = new MessageFrom
48-
{
49-
DisplayName = displayName,
50-
Id = message.FromId
51-
}
52-
});
40+
displayName = "(unknown)";
5341
}
5442

55-
public Message AddMessage(Message message)
43+
return AddMessage(new Message
5644
{
57-
AllMessages.Push(message);
58-
_messageStream.OnNext(message);
59-
return message;
60-
}
45+
Content = message.Content,
46+
SentAt = message.SentAt ?? DateTime.UtcNow,
47+
From = new MessageFrom
48+
{
49+
DisplayName = displayName,
50+
Id = message.FromId
51+
}
52+
});
53+
}
6154

62-
public IObservable<Message> Messages(string user)
63-
{
64-
return _messageStream
65-
.Select(message =>
66-
{
67-
message.Sub = user;
68-
return message;
69-
})
70-
.AsObservable();
71-
}
55+
public Message AddMessage(Message message)
56+
{
57+
AllMessages.Push(message);
58+
_messageStream.OnNext(message);
59+
return message;
60+
}
7261

73-
public void AddError(Exception exception) => _messageStream.OnError(exception);
62+
public IObservable<Message> Messages(string user)
63+
{
64+
return _messageStream
65+
.Select(message =>
66+
{
67+
message.Sub = user;
68+
return message;
69+
})
70+
.AsObservable();
7471
}
72+
73+
public void AddError(Exception exception) => _messageStream.OnError(exception);
7574
}

‎samples/Samples.Schemas.Chat/Message.cs

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
namespace GraphQL.Samples.Schemas.Chat
1+
namespace GraphQL.Samples.Schemas.Chat;
2+
3+
public class Message
24
{
3-
public class Message
4-
{
5-
public MessageFrom From { get; set; }
5+
public MessageFrom From { get; set; }
66

7-
public string Sub { get; set; }
7+
public string Sub { get; set; }
88

9-
public string Content { get; set; }
9+
public string Content { get; set; }
1010

11-
public DateTime? SentAt { get; set; }
12-
}
11+
public DateTime? SentAt { get; set; }
1312
}

‎samples/Samples.Schemas.Chat/MessageFrom.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
namespace GraphQL.Samples.Schemas.Chat
1+
namespace GraphQL.Samples.Schemas.Chat;
2+
3+
public class MessageFrom
24
{
3-
public class MessageFrom
4-
{
5-
public string Id { get; set; }
5+
public string Id { get; set; }
66

7-
public string DisplayName { get; set; }
8-
}
7+
public string DisplayName { get; set; }
98
}

‎samples/Samples.Schemas.Chat/MessageFromType.cs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
using GraphQL.Types;
22

3-
namespace GraphQL.Samples.Schemas.Chat
3+
namespace GraphQL.Samples.Schemas.Chat;
4+
5+
public class MessageFromType : ObjectGraphType<MessageFrom>
46
{
5-
public class MessageFromType : ObjectGraphType<MessageFrom>
7+
public MessageFromType()
68
{
7-
public MessageFromType()
8-
{
9-
Field(o => o.Id);
10-
Field(o => o.DisplayName);
11-
}
9+
Field(o => o.Id);
10+
Field(o => o.DisplayName);
1211
}
1312
}

0 commit comments

Comments
 (0)