Cleanups

Author: bartelink

FSharp.AWS.DynamoDB.sln.DotSettings

@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=hkey/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

src/FSharp.AWS.DynamoDB/Expression/ConditionalExpr.fs

@@ -144,7 +144,7 @@ let extractKeyCondition (qExpr: QueryExpr) =
         | None ->
             hk.KeySchemata
             |> Array.tryPick (function
-                | (ks, KeyType.Hash) -> Some ks
+                | ks, KeyType.Hash -> Some ks
                 | _ -> None)
         | Some rk ->
             Seq.joinBy (fun (ks, kt) (ks', kt') -> kt = KeyType.Hash && kt' = KeyType.Range && ks = ks') hk.KeySchemata rk.KeySchemata
@@ -163,7 +163,7 @@ let ensureNotTautological query =
 let extractQueryExpr (recordInfo: RecordTableInfo) (expr: Expr) : ConditionalExpression =
     if not expr.IsClosed then
         invalidArg "expr" "supplied query is not a closed expression."
-    let invalidQuery () = invalidArg "expr" <| sprintf "Supplied expression is not a valid conditional."
+    let invalidQuery () = invalidArg "expr" "Supplied expression is not a valid conditional."
 
     let nParams, (|PVar|_|), expr' = extractExprParams recordInfo expr
 
@@ -233,12 +233,12 @@ let extractQueryExpr (recordInfo: RecordTableInfo) (expr: Expr) : ConditionalExp
         let (|Comparison|_|) (pat: Expr) (expr: Expr) =
             match expr with
             | SpecificCall pat (None, _, args) ->
-                let pickler = args |> List.tryPick (|AttributeGet|_|) |> Option.map (fun attr -> attr.Pickler)
+                let pickler = args |> List.tryPick (|AttributeGet|_|) |> Option.map _.Pickler
                 let operands = args |> List.map (extractOperand pickler)
                 let pickler =
                     match pickler with
                     | Some p -> p
-                    | None -> Pickler.resolveUntyped args.[0].Type
+                    | None -> Pickler.resolveUntyped args[0].Type
                 Some(pickler, operands)
 
             | _ -> None
@@ -354,7 +354,7 @@ let applyParams (cond: ConditionalExpression) (inputValues: obj[]) =
     let applyOperand (op: Operand) =
         match op with
         | Param(i, pickler) ->
-            match pickler.PickleCoerced inputValues.[i] with
+            match pickler.PickleCoerced inputValues[i] with
             | Some av -> Value(wrap av)
             | None -> Undefined
 
@@ -396,7 +396,7 @@ let applyParams (cond: ConditionalExpression) (inputValues: obj[]) =
 
 /// prints a query expression to string recognizable by the DynamoDB APIs
 let writeConditionExpression (writer: AttributeWriter) (cond: ConditionalExpression) =
-    let sb = new System.Text.StringBuilder()
+    let sb = System.Text.StringBuilder()
     let inline (!) (p: string) = sb.Append p |> ignore
     let inline writeOp o =
         match o with
@@ -411,12 +411,12 @@ let writeConditionExpression (writer: AttributeWriter) (cond: ConditionalExpress
 
     let writeOps (ops: Operand array) =
         if ops.Length = 1 then
-            writeOp ops.[0]
+            writeOp ops[0]
         else
             for i = 0 to ops.Length - 2 do
-                writeOp ops.[i]
+                writeOp ops[i]
                 ! ", "
-            writeOp ops.[ops.Length - 1]
+            writeOp ops[ops.Length - 1]
 
 
     let inline writeCmp cmp =

src/FSharp.AWS.DynamoDB/Expression/ExprCommon.fs

@@ -25,7 +25,7 @@ type NestedAttribute =
     member nf.Print() =
         match nf with
         | FParam i -> sprintf "<$param%d>" i
-        | FField f when not <| isValidFieldName f -> sprintf "map keys must be 1 to 64k long (as utf8)." |> invalidArg f
+        | FField f when not <| isValidFieldName f -> invalidArg f "map keys must be 1 to 64k long (as utf8)."
         | FField f -> "." + f
         | FIndex i -> sprintf "[%d]" i
 
@@ -56,43 +56,43 @@ type AttributeId =
 
     member id.Tokens = seq {
         yield id.RootName
-        yield! id.NestedAttributes |> Seq.map (fun nf -> nf.Print())
+        yield! id.NestedAttributes |> Seq.map _.Print()
     }
 
     member id.IsHashKey =
         List.isEmpty id.NestedAttributes
         && id.KeySchemata
            |> Array.exists (function
-               | (_, KeyType.Hash) -> true
+               | _, KeyType.Hash -> true
                | _ -> false)
 
     member id.IsRangeKey =
         List.isEmpty id.NestedAttributes
         && id.KeySchemata
            |> Array.exists (function
-               | (_, KeyType.Range) -> true
+               | _, KeyType.Range -> true
                | _ -> false)
 
     member id.IsPrimaryKey =
         List.isEmpty id.NestedAttributes
         && id.KeySchemata
            |> Array.exists (function
-               | ({ Type = PrimaryKey }, _) -> true
+               | { Type = PrimaryKey }, _ -> true
                | _ -> false)
 
     member id.Append nf = { id with NestedAttributes = id.NestedAttributes @ [ nf ] }
     member id.Apply(inputs: obj[]) =
         let applyField nf =
             match nf with
             | FParam i ->
-                match inputs.[i] with
+                match inputs[i] with
                 | :? string as f -> FField f
                 | :? int as i ->
                     if i < 0 then
                         raise <| ArgumentOutOfRangeException()
                     else
                         FIndex i
-                | _ -> raise <| new InvalidCastException()
+                | _ -> raise <| InvalidCastException()
             | _ -> nf
 
         { id with NestedAttributes = id.NestedAttributes |> List.map applyField }
@@ -107,7 +107,7 @@ type AttributeId =
 
 type PropertyMetadata with
 
-    /// Gets an attribute Id for given record property that
+    /// Gets an attribute id for given record property that
     /// is recognizable by DynamoDB
     member rp.AttrId = sprintf "#ATTR%d" rp.Index
 
@@ -137,7 +137,7 @@ type QuotedAttribute =
 
         aux ap
 
-    /// Gets an attribute identifier for given Quoted attribute instace
+    /// Gets an attribute identifier for given Quoted attribute instance
     member ap.Id =
         let rec getTokens acc ap =
             match ap with
@@ -250,30 +250,29 @@ type QuotedAttribute =
 /// Wrapper API for writing attribute names and values for Dynamo query, update and condition expressions
 /// Responsible for generating unique placeholders for attribute names and values
 type AttributeWriter(names: Dictionary<string, string>, values: Dictionary<string, AttributeValue>) =
-    static let cmp = new AttributeValueComparer()
-    let vcontents = new Dictionary<AttributeValue, string>(cmp)
+    static let cmp = AttributeValueComparer()
+    let ids = Dictionary<AttributeValue, string>(cmp)
 
     new() = AttributeWriter(Dictionary(), Dictionary())
 
     member _.Names= if names.Count = 0 then null else names
     member _.Values = if values.Count = 0 then null else values
 
     member _.WriteValue(av: AttributeValue) =
-        let ok, found = vcontents.TryGetValue av
-        if ok then
-            found
-        else
+        match ids.TryGetValue av with
+        | true, id -> id
+        | false, _ ->
             let id = sprintf ":val%d" values.Count
-            vcontents.Add(av, id)
+            ids.Add(av, id)
             values.Add(id, av)
             id
     member _.WriteAttribute(attr: AttributeId) =
         names[attr.RootId] <- attr.RootName
         attr.Id
 
-/// Recognizes exprs of shape <@ fun p1 p2 ... -> body @>
+/// Recognizes Expr values of shape <@ fun p1 p2 ... -> body @>
 let extractExprParams (recordInfo: RecordTableInfo) (expr: Expr) =
-    let vars = new Dictionary<Var, int>()
+    let vars = Dictionary<Var, int>()
     let rec aux i expr =
         match expr with
         | Lambda(v, body) when v.Type <> recordInfo.Type ->
@@ -297,26 +296,26 @@ let extractExprParams (recordInfo: RecordTableInfo) (expr: Expr) =
 type private AttributeNode = { Value: string; Children: ResizeArray<AttributeNode> }
 /// Detects conflicts in a collection of attribute paths
 let tryFindConflictingPaths (attrs: seq<AttributeId>) =
-    let root = new ResizeArray<AttributeNode>()
+    let root = ResizeArray<AttributeNode>()
     let tryAppendPath (attr: AttributeId) =
         let tokens = attr.Tokens
         let enum = tokens.GetEnumerator()
         let mutable ctx = root
         let mutable isNodeAdded = false
         let mutable isLeafFound = false
-        let acc = new ResizeArray<_>()
+        let acc = ResizeArray<_>()
         while not isLeafFound && enum.MoveNext() do
             let t = enum.Current
             let child =
                 match ctx.FindIndex(fun n -> n.Value = t) with
                 | -1 ->
                     isNodeAdded <- true
-                    let ch = { Value = t; Children = new ResizeArray<_>() }
+                    let ch = { Value = t; Children = ResizeArray<_>() }
                     ctx.Add ch
                     ch
 
                 | i ->
-                    let ch = ctx.[i]
+                    let ch = ctx[i]
                     if ch.Children.Count = 0 then
                         isLeafFound <- true
                     ch
@@ -329,7 +328,7 @@ let tryFindConflictingPaths (attrs: seq<AttributeId>) =
             Some(concat tokens, concat acc)
         elif not isNodeAdded then
             while ctx.Count > 0 do
-                let ch = ctx.[0]
+                let ch = ctx[0]
                 acc.Add ch.Value
                 ctx <- ch.Children
 

src/FSharp.AWS.DynamoDB/Expression/ProjectionExpr.fs

@@ -47,7 +47,7 @@ type AttributeId with
                     if i < 0 || i >= av.L.Count then
                         sprintf "Indexed path '%s' out of range." id.Name |> ArgumentOutOfRangeException |> raise
                     else
-                        aux result tl av.L.[i]
+                        aux result tl av.L[i]
                 else
                     av.Print() |> sprintf "Expected list, but was '%s'." |> InvalidCastException |> raise
 
@@ -107,8 +107,8 @@ type ProjectionExpr =
                         | _ -> invalidExpr ())
                     |> Seq.toArray
 
-                let attrs = qAttrs |> Array.map (fun qa -> qa.Id)
-                let picklers = qAttrs |> Array.map (fun qa -> qa.Pickler)
+                let attrs = qAttrs |> Array.map _.Id
+                let picklers = qAttrs |> Array.map _.Pickler
 
                 // check for conflicting projection attributes
                 match tryFindConflictingPaths attrs with
@@ -123,11 +123,11 @@ type ProjectionExpr =
                     let values = Array.zeroCreate<obj> attrs.Length
                     for i = 0 to attrs.Length - 1 do
                         let mutable av = null
-                        let ok = attrs.[i].View(ro, &av)
+                        let ok = attrs[i].View(ro, &av)
                         if ok then
-                            values.[i] <- picklers.[i].UnPickleUntyped av
+                            values[i] <- picklers[i].UnPickleUntyped av
                         else
-                            values.[i] <- picklers.[i].DefaultValueUntyped
+                            values[i] <- picklers[i].DefaultValueUntyped
 
                     tupleCtor values
 
@@ -137,7 +137,7 @@ type ProjectionExpr =
         | _ -> invalidExpr ()
 
     member __.Write(writer: AttributeWriter) =
-        let sb = new System.Text.StringBuilder()
+        let sb = System.Text.StringBuilder()
         let inline (!) (x: string) = sb.Append x |> ignore
         let mutable isFirst = true
         for attr in __.Attributes do

src/FSharp.AWS.DynamoDB/Expression/UpdateExpr.fs

@@ -141,7 +141,7 @@ type UpdateOperation with
 let extractRecordExprUpdaters (recordInfo: RecordTableInfo) (expr: Expr) : IntermediateUpdateExprs =
     if not expr.IsClosed then
         invalidArg "expr" "supplied update expression contains free variables."
-    let invalidExpr () = invalidArg "expr" <| sprintf "Supplied expression is not a valid update expression."
+    let invalidExpr () = invalidArg "expr" "Supplied expression is not a valid update expression."
 
     let nParams, pRecognizer, expr' = extractExprParams recordInfo expr
 
@@ -156,10 +156,10 @@ let extractRecordExprUpdaters (recordInfo: RecordTableInfo) (expr: Expr) : Inter
         let bindings, assignments = stripBindings Map.empty body
 
         let tryExtractValueExpr (i: int) (assignment: Expr) =
-            let rp = recordInfo.Properties.[i]
+            let rp = recordInfo.Properties[i]
             match assignment with
             | PropertyGet(Some(Var y), prop, []) when r = y && rp.PropertyInfo = prop -> None
-            | Var v when bindings.ContainsKey v -> Some(Root(rp, recordInfo.GetPropertySchemata rp.Name), bindings.[v])
+            | Var v when bindings.ContainsKey v -> Some(Root(rp, recordInfo.GetPropertySchemata rp.Name), bindings[v])
             | e -> Some(Root(rp, recordInfo.GetPropertySchemata rp.Name), e)
 
         let assignmentExprs = assignments |> Seq.mapi tryExtractValueExpr |> Seq.choose id |> Seq.toArray
@@ -178,7 +178,7 @@ let extractRecordExprUpdaters (recordInfo: RecordTableInfo) (expr: Expr) : Inter
 let extractOpExprUpdaters (recordInfo: RecordTableInfo) (expr: Expr) : IntermediateUpdateExprs =
     if not expr.IsClosed then
         invalidArg "expr" "supplied update expression contains free variables."
-    let invalidExpr () = invalidArg "expr" <| sprintf "Supplied expression is not a valid update expression."
+    let invalidExpr () = invalidArg "expr" "Supplied expression is not a valid update expression."
 
     let nParams, (|PVar|_|), expr' = extractExprParams recordInfo expr
 
@@ -196,9 +196,9 @@ let extractOpExprUpdaters (recordInfo: RecordTableInfo) (expr: Expr) : Intermedi
     match expr' with
     | Lambda(r, body) when r.Type = recordInfo.Type ->
         let (|AttributeGet|_|) (e: Expr) = QuotedAttribute.TryExtract (|PVar|_|) r recordInfo e
-        let attrs = new ResizeArray<QuotedAttribute>()
-        let assignments = new ResizeArray<QuotedAttribute * Expr>()
-        let updateOps = new ResizeArray<UpdateOperation>()
+        let attrs = ResizeArray<QuotedAttribute>()
+        let assignments = ResizeArray<QuotedAttribute * Expr>()
+        let updateOps = ResizeArray<UpdateOperation>()
         let rec extract e =
             match e with
             | SpecificCall2 <@ (&&&) @> (None, _, _, [ l; r ]) ->
@@ -227,7 +227,7 @@ let extractOpExprUpdaters (recordInfo: RecordTableInfo) (expr: Expr) : Intermedi
 
         do extract body
 
-        match attrs |> Seq.map (fun attr -> attr.Id) |> tryFindConflictingPaths with
+        match attrs |> Seq.map _.Id |> tryFindConflictingPaths with
         | Some(p1, p2) ->
             let msg = sprintf "found conflicting paths '%s' and '%s' being accessed in update expression." p1 p2
             invalidArg "expr" msg
@@ -248,7 +248,7 @@ let extractOpExprUpdaters (recordInfo: RecordTableInfo) (expr: Expr) : Intermedi
 
 /// Completes conversion from intermediate update expression to final update operations
 let extractUpdateOps (exprs: IntermediateUpdateExprs) =
-    let invalidExpr () = invalidArg "expr" <| sprintf "Supplied expression is not a valid update expression."
+    let invalidExpr () = invalidArg "expr" "Supplied expression is not a valid update expression."
     let (|PVar|_|) = exprs.ParamRecognizer
     let (|AttributeGet|_|) (e: Expr) = QuotedAttribute.TryExtract (|PVar|_|) exprs.RVar exprs.RecordInfo e
 
@@ -368,7 +368,7 @@ let applyParams (uops: UpdateOperations) (inputValues: obj[]) =
     let applyOperand (op: Operand) =
         match op with
         | Param(i, pickler) ->
-            match pickler.PickleCoerced inputValues.[i] with
+            match pickler.PickleCoerced inputValues[i] with
             | Some av -> Value(wrap av)
             | None -> Undefined
 
@@ -405,7 +405,7 @@ let applyParams (uops: UpdateOperations) (inputValues: obj[]) =
 /// prints a set of update operations to string recognizable by the DynamoDB APIs
 let writeUpdateExpression (writer: AttributeWriter) (uops: UpdateOperations) =
 
-    let sb = new System.Text.StringBuilder()
+    let sb = System.Text.StringBuilder()
     let inline (!) (s: string) = sb.Append s |> ignore
 
     let inline writeAttr attr = !(writer.WriteAttribute attr)