Skip to content

Commit 05551ec

Browse files
committed
Migrated to single undescore _.
1 parent 6ab1f6e commit 05551ec

File tree

28 files changed

+301
-301
lines changed

28 files changed

+301
-301
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,9 +278,9 @@ Optionally, for ease of implementation, concrete class to derive from can be use
278278
```fsharp
279279
type ExecutorMiddleware(?compile, ?plan, ?execute) =
280280
interface IExecutorMiddleware with
281-
member __.CompileSchema = compile
282-
member __.PlanOperation = plan
283-
member __.ExecuteOperationAsync = execute
281+
member _.CompileSchema = compile
282+
member _.PlanOperation = plan
283+
member _.ExecuteOperationAsync = execute
284284
```
285285

286286
Each of the middleware functions act like an intercept function, with two parameters: the context of the phase, the function of the next middleware (or the actual phase itself, wich is the last to run), and the return value. Those functions can be passed as an argument to the constructor of the `Executor<'Root>` object:

samples/star-wars-api/JsonConverters.fs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@ open FSharp.Data.GraphQL.Types.Patterns
1111
type OptionConverter() =
1212
inherit JsonConverter()
1313

14-
override __.CanConvert(t) =
14+
override _.CanConvert(t) =
1515
t.IsGenericType && t.GetGenericTypeDefinition() = typedefof<option<_>>
1616

17-
override __.WriteJson(writer, value, serializer) =
17+
override _.WriteJson(writer, value, serializer) =
1818
let value =
1919
if isNull value then null
2020
else
2121
let _,fields = Microsoft.FSharp.Reflection.FSharpValue.GetUnionFields(value, value.GetType())
2222
fields.[0]
2323
serializer.Serialize(writer, value)
2424

25-
override __.ReadJson(reader, t, _, serializer) =
25+
override _.ReadJson(reader, t, _, serializer) =
2626
let innerType = t.GetGenericArguments().[0]
2727
let innerType =
2828
if innerType.IsValueType then (typedefof<System.Nullable<_>>).MakeGenericType([|innerType|])
@@ -36,14 +36,14 @@ type OptionConverter() =
3636
type GraphQLQueryConverter<'a>(executor : Executor<'a>, replacements: Map<string, obj>, ?meta : Metadata) =
3737
inherit JsonConverter()
3838

39-
override __.CanConvert(t) = t = typeof<GraphQLQuery>
40-
41-
override __.WriteJson(_, _, _) = failwith "Not supported"
39+
override _.CanConvert(t) = t = typeof<GraphQLQuery>
4240

43-
override __.ReadJson(reader, _, _, serializer) =
41+
override _.WriteJson(_, _, _) = failwith "Not supported"
42+
43+
override _.ReadJson(reader, _, _, serializer) =
4444
let jobj = JObject.Load reader
4545
let query = jobj.Property("query").Value.ToString()
46-
let plan =
46+
let plan =
4747
match meta with
4848
| Some meta -> executor.CreateExecutionPlan(query, meta = meta)
4949
| None -> executor.CreateExecutionPlan(query)
@@ -54,12 +54,12 @@ type GraphQLQueryConverter<'a>(executor : Executor<'a>, replacements: Map<string
5454
// For multipart requests, we need to replace some variables
5555
Map.iter(fun path rep -> jobj.SelectToken(path).Replace(JObject.FromObject(rep))) replacements
5656
let vars = JObject.Parse(jobj.Property("variables").Value.ToString())
57-
let variables =
57+
let variables =
5858
vs
5959
|> List.fold (fun (acc: Map<string, obj>)(vdef: VarDef) ->
6060
match vars.TryGetValue(vdef.Name) with
6161
| true, jval ->
62-
let v =
62+
let v =
6363
match jval.Type with
6464
| JTokenType.Null -> null
6565
| JTokenType.String -> jval.ToString() :> obj
@@ -76,13 +76,13 @@ type GraphQLQueryConverter<'a>(executor : Executor<'a>, replacements: Map<string
7676
type WebSocketClientMessageConverter<'a>(executor : Executor<'a>, replacements: Map<string, obj>, ?meta : Metadata) =
7777
inherit JsonConverter()
7878

79-
override __.CanWrite = false
79+
override _.CanWrite = false
8080

81-
override __.CanConvert(t) = t = typeof<WebSocketClientMessage>
81+
override _.CanConvert(t) = t = typeof<WebSocketClientMessage>
8282

83-
override __.WriteJson(_, _, _) = failwith "Not supported"
83+
override _.WriteJson(_, _, _) = failwith "Not supported"
8484

85-
override __.ReadJson(reader, _, _, _) =
85+
override _.ReadJson(reader, _, _, _) =
8686
let jobj = JObject.Load reader
8787
let typ = jobj.Property("type").Value.ToString()
8888
match typ with
@@ -117,11 +117,11 @@ type WebSocketClientMessageConverter<'a>(executor : Executor<'a>, replacements:
117117
type WebSocketServerMessageConverter() =
118118
inherit JsonConverter()
119119

120-
override __.CanRead = false
120+
override _.CanRead = false
121121

122-
override __.CanConvert(t) = t = typedefof<WebSocketServerMessage> || t.DeclaringType = typedefof<WebSocketServerMessage>
122+
override _.CanConvert(t) = t = typedefof<WebSocketServerMessage> || t.DeclaringType = typedefof<WebSocketServerMessage>
123123

124-
override __.WriteJson(writer, value, _) =
124+
override _.WriteJson(writer, value, _) =
125125
let value = value :?> WebSocketServerMessage
126126
let jobj = JObject()
127127
match value with
@@ -146,4 +146,4 @@ type WebSocketServerMessageConverter() =
146146
jobj.Add(JProperty("type", "complete"))
147147
jobj.Add(JProperty("id", id))
148148
jobj.WriteTo(writer)
149-
override __.ReadJson(_, _, _, _) = failwith "Not supported"
149+
override _.ReadJson(_, _, _, _) = failwith "Not supported"

samples/star-wars-api/Startup.fs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ type Startup private () =
1313
Startup() then
1414
this.Configuration <- configuration
1515

16-
member __.ConfigureServices(services: IServiceCollection) =
16+
member _.ConfigureServices(services: IServiceCollection) =
1717
services.AddGiraffe()
1818
.Configure(Action<KestrelServerOptions>(fun x -> x.AllowSynchronousIO <- true))
1919
.Configure(Action<IISServerOptions>(fun x -> x.AllowSynchronousIO <- true))
2020
|> ignore
2121

22-
member __.Configure(app: IApplicationBuilder) =
22+
member _.Configure(app: IApplicationBuilder) =
2323
let errorHandler (ex : Exception) (log : ILogger) =
2424
log.LogError(EventId(), ex, "An unhandled exception has occurred while executing the request.")
2525
clearResponse >=> setStatusCode 500

samples/star-wars-api/WebSocketMiddleware.fs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,44 +17,44 @@ type GraphQLWebSocket(innerSocket : WebSocket) =
1717
let subscriptions = ConcurrentDictionary<string, IDisposable>() :> IDictionary<string, IDisposable>
1818
let id = System.Guid.NewGuid()
1919

20-
override __.CloseStatus = innerSocket.CloseStatus
20+
override _.CloseStatus = innerSocket.CloseStatus
2121

22-
override __.CloseStatusDescription = innerSocket.CloseStatusDescription
22+
override _.CloseStatusDescription = innerSocket.CloseStatusDescription
2323

24-
override __.State = innerSocket.State
24+
override _.State = innerSocket.State
2525

26-
override __.SubProtocol = innerSocket.SubProtocol
26+
override _.SubProtocol = innerSocket.SubProtocol
2727

28-
override __.CloseAsync(status, description, ct) = innerSocket.CloseAsync(status, description, ct)
28+
override _.CloseAsync(status, description, ct) = innerSocket.CloseAsync(status, description, ct)
2929

30-
override __.CloseOutputAsync(status, description, ct) = innerSocket.CloseOutputAsync(status, description, ct)
30+
override _.CloseOutputAsync(status, description, ct) = innerSocket.CloseOutputAsync(status, description, ct)
3131

3232
override this.Dispose() =
3333
this.UnsubscribeAll()
3434
innerSocket.Dispose()
3535

36-
override __.ReceiveAsync(buffer : ArraySegment<byte>, ct) = innerSocket.ReceiveAsync(buffer, ct)
36+
override _.ReceiveAsync(buffer : ArraySegment<byte>, ct) = innerSocket.ReceiveAsync(buffer, ct)
3737

38-
override __.SendAsync(buffer : ArraySegment<byte>, msgType, endOfMsg, ct) = innerSocket.SendAsync(buffer, msgType, endOfMsg, ct)
38+
override _.SendAsync(buffer : ArraySegment<byte>, msgType, endOfMsg, ct) = innerSocket.SendAsync(buffer, msgType, endOfMsg, ct)
3939

40-
override __.Abort() = innerSocket.Abort()
40+
override _.Abort() = innerSocket.Abort()
4141

42-
member __.Subscribe(id : string, unsubscriber : IDisposable) =
42+
member _.Subscribe(id : string, unsubscriber : IDisposable) =
4343
subscriptions.Add(id, unsubscriber)
4444

45-
member __.Unsubscribe(id : string) =
45+
member _.Unsubscribe(id : string) =
4646
match subscriptions.ContainsKey(id) with
4747
| true ->
4848
subscriptions.[id].Dispose()
4949
subscriptions.Remove(id) |> ignore
5050
| false -> ()
5151

52-
member __.UnsubscribeAll() =
52+
member _.UnsubscribeAll() =
5353
subscriptions
5454
|> Seq.iter (fun x -> x.Value.Dispose())
5555
subscriptions.Clear()
5656

57-
member __.Id = id
57+
member _.Id = id
5858

5959
module SocketManager =
6060
let private sockets = ConcurrentDictionary<Guid, GraphQLWebSocket>() :> IDictionary<Guid, GraphQLWebSocket>
@@ -145,7 +145,7 @@ module SocketManager =
145145
handleMessages executor root socket |> Async.RunSynchronously
146146

147147
type GraphQLWebSocketMiddleware<'Root>(next : RequestDelegate, executor : Executor<'Root>, root : unit -> 'Root) =
148-
member __.Invoke(ctx : HttpContext) =
148+
member _.Invoke(ctx : HttpContext) =
149149
async {
150150
match ctx.WebSockets.IsWebSocketRequest with
151151
| true ->

src/FSharp.Data.GraphQL.Client.DesignTime/ProvidedTypesHelper.fs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/// The MIT License (MIT)
1+
/// The MIT License (MIT)
22
/// Copyright (c) 2016 Bazinga Technologies Inc
33
44
namespace FSharp.Data.GraphQL
@@ -126,9 +126,9 @@ type internal ProvidedRecordTypeDefinition(className, baseType) =
126126

127127
let mutable properties : RecordPropertyMetadata list = []
128128

129-
member __.GetRecordProperties() = properties
129+
member _.GetRecordProperties() = properties
130130

131-
member __.SetRecordProperties(props) = properties <- props
131+
member _.SetRecordProperties(props) = properties <- props
132132

133133
[<AutoOpen>]
134134
module internal Failures =

src/FSharp.Data.GraphQL.Client/BaseTypes.fs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/// The MIT License (MIT)
1+
/// The MIT License (MIT)
22
/// Copyright (c) 2016 Bazinga Technologies Inc
33
44
namespace FSharp.Data.GraphQL
@@ -64,10 +64,10 @@ module HttpHeaders =
6464
/// The base type for all GraphQLProvider provided enum types.
6565
type EnumBase (name : string, value : string) =
6666
/// Gets the name of the provided enum type.
67-
member __.GetName() = name
67+
member _.GetName() = name
6868

6969
/// Gets the value of the provided enum type.
70-
member __.GetValue() = value
70+
member _.GetValue() = value
7171

7272
override x.ToString() = x.GetValue()
7373

@@ -106,10 +106,10 @@ type RecordBase (name : string, properties : RecordProperty seq) =
106106
else []
107107

108108
/// Gets the name of this provided record type.
109-
member __.GetName() = name
109+
member _.GetName() = name
110110

111111
/// Gets a list of this provided record properties.
112-
member __.GetProperties() = properties
112+
member _.GetProperties() = properties
113113

114114
/// Produces a dictionary containing all the properties of this provided record type.
115115
member x.ToDictionary() =
@@ -415,18 +415,18 @@ type OperationResultBase (responseJson : JsonValue, operationFields : SchemaFiel
415415
JsonValueHelper.getResponseCustomFields responseJson
416416
|> Serialization.deserializeMap
417417

418-
member private __.ResponseJson = responseJson
418+
member private _.ResponseJson = responseJson
419419

420420
/// <exclude />
421421
[<EditorBrowsableAttribute(EditorBrowsableState.Never)>]
422422
[<CompilerMessageAttribute("This property is intended for use in generated code only.", 10001, IsHidden=true, IsError=false)>]
423-
member __.RawData = rawData
423+
member _.RawData = rawData
424424

425425
/// Gets all the errors returned by the operation on the server.
426-
member __.Errors = errors
426+
member _.Errors = errors
427427

428428
/// Gets all the custom data returned by the operation on server as a map of names and values.
429-
member __.CustomData = customData
429+
member _.CustomData = customData
430430

431431
member x.Equals(other : OperationResultBase) =
432432
x.ResponseJson = other.ResponseJson
@@ -441,4 +441,4 @@ type OperationResultBase (responseJson : JsonValue, operationFields : SchemaFiel
441441
/// The base type for al GraphQLProvider operation provided types.
442442
type OperationBase (query : string) =
443443
/// Gets the query string of the operation.
444-
member __.Query = query
444+
member _.Query = query

src/FSharp.Data.GraphQL.Client/GraphQLClientConnection.fs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ type GraphQLClientConnection(invoker : HttpMessageInvoker, ownsInvoker : bool) =
2828
new() = new GraphQLClientConnection(new HttpClient(), true)
2929

3030
/// The System.Net.Http.HttpMessageInvoker used by this connection.
31-
member __.Invoker = invoker
31+
member _.Invoker = invoker
3232

3333
interface IDisposable with
34-
member __.Dispose() = if ownsInvoker then invoker.Dispose()
34+
member _.Dispose() = if ownsInvoker then invoker.Dispose()

src/FSharp.Data.GraphQL.Client/JsonValue.fs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// --------------------------------------------------------------------------------------
1+
// --------------------------------------------------------------------------------------
22
// Copyright (c) Microsoft Corporation 2005-2012.
33
// This sample code is provided "as is" without warranty of any kind.
44
// We disclaim all warranties, either express or implied, including the
@@ -276,7 +276,7 @@ type private JsonParser(jsonText:string) =
276276
i <- i + expected.Length
277277
r
278278

279-
member __.Parse() =
279+
member _.Parse() =
280280
let value = parseRootValue()
281281
skipWhitespace()
282282
if i <> s.Length then
@@ -290,4 +290,4 @@ type JsonValue with
290290
/// Attempts to parse the specified JSON string.
291291
static member TryParse(text) =
292292
try Some <| JsonParser(text).Parse()
293-
with _ -> None
293+
with _ -> None

src/FSharp.Data.GraphQL.Client/Upload.fs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/// The MIT License (MIT)
1+
/// The MIT License (MIT)
22
/// Copyright (c) 2016 Bazinga Technologies Inc
33
44
namespace FSharp.Data.GraphQL
@@ -17,10 +17,10 @@ type Upload (stream : Stream, fileName : string, ?contentType : string, ?ownsStr
1717
| None -> new Upload(stream, fileName, ownsStream = true)
1818

1919
/// Gets the stream associated to this Upload type.
20-
member __.Stream = stream
20+
member _.Stream = stream
2121

2222
/// Gets the content type of this Upload type.
23-
member __.ContentType =
23+
member _.ContentType =
2424
match contentType with
2525
| Some ct -> ct
2626
| None ->
@@ -30,11 +30,11 @@ type Upload (stream : Stream, fileName : string, ?contentType : string, ?ownsStr
3030
| _ -> "application/octet-stream"
3131

3232
/// Gets the name of the file which contained on the stream.
33-
member __.FileName = fileName
33+
member _.FileName = fileName
3434

3535
/// Gets a boolean value indicating if this Upload type owns the stream associated with it.
3636
/// If true, it will dispose the stream when this Upload type is disposed.
37-
member __.OwnsStream = defaultArg ownsStream false
37+
member _.OwnsStream = defaultArg ownsStream false
3838

3939
interface IDisposable with
40-
member x.Dispose() = if x.OwnsStream then x.Stream.Dispose()
40+
member x.Dispose() = if x.OwnsStream then x.Stream.Dispose()

src/FSharp.Data.GraphQL.Server.Middleware/MiddlewareDefinitions.fs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ type internal QueryWeightMiddleware(threshold : float, reportToMetadata : bool)
5656
then next ctx
5757
else error ctx
5858
interface IExecutorMiddleware with
59-
member __.CompileSchema = None
60-
member __.PostCompileSchema = None
61-
member __.PlanOperation = None
62-
member __.ExecuteOperationAsync = Some (middleware threshold)
59+
member _.CompileSchema = None
60+
member _.PostCompileSchema = None
61+
member _.PlanOperation = None
62+
member _.ExecuteOperationAsync = Some (middleware threshold)
6363

6464
type internal ObjectListFilterMiddleware<'ObjectType, 'ListType>(reportToMetadata : bool) =
6565
let compileMiddleware (ctx : SchemaCompileContext) (next : SchemaCompileContext -> unit) =
@@ -110,10 +110,10 @@ type internal ObjectListFilterMiddleware<'ObjectType, 'ListType>(reportToMetadat
110110
| false -> ctx
111111
next ctx
112112
interface IExecutorMiddleware with
113-
member __.CompileSchema = Some compileMiddleware
114-
member __.PostCompileSchema = None
115-
member __.PlanOperation = None
116-
member __.ExecuteOperationAsync = Some reportMiddleware
113+
member _.CompileSchema = Some compileMiddleware
114+
member _.PostCompileSchema = None
115+
member _.PlanOperation = None
116+
member _.ExecuteOperationAsync = Some reportMiddleware
117117

118118
/// A function that resolves an identity name for a schema object, based on a object definition of it.
119119
type IdentityNameResolver = ObjectDef -> string
@@ -152,7 +152,7 @@ type internal LiveQueryMiddleware(identityNameResolver : IdentityNameResolver) =
152152
then ctx.Schema.LiveFieldSubscriptionProvider.Register x)
153153
next ctx
154154
interface IExecutorMiddleware with
155-
member __.CompileSchema = Some middleware
156-
member __.PostCompileSchema = None
157-
member __.PlanOperation = None
158-
member __.ExecuteOperationAsync = None
155+
member _.CompileSchema = Some middleware
156+
member _.PostCompileSchema = None
157+
member _.PlanOperation = None
158+
member _.ExecuteOperationAsync = None

0 commit comments

Comments
 (0)