Merge branch 'master' into dm/validation

Author: darrelmiller

src/Microsoft.OpenApi/Expressions/BodyExpression.cs

@@ -54,5 +54,16 @@ public override string Expression
                 return Body + PointerPrefix + Value;
             }
         }
+
+        /// <summary>
+        /// Gets the fragment string.
+        /// </summary>
+        public string Fragment
+        {
+            get
+            {
+                return Value;
+            }
+        }
     }
 }

src/Microsoft.OpenApi/Expressions/HeaderExpression.cs

@@ -36,5 +36,16 @@ public override string Expression
                 return Header + Value;
             }
         }
+
+        /// <summary>
+        /// Gets the token string.
+        /// </summary>
+        public string Token
+        {
+            get
+            {
+                return Value;
+            }
+        }
     }
 }

src/Microsoft.OpenApi/Expressions/MethodExpression.cs

@@ -17,5 +17,17 @@ public sealed class MethodExpression : RuntimeExpression
         /// Gets the expression string.
         /// </summary>
         public override string Expression { get; } = Method;
+
+        /// <summary>
+        /// Gets the singleton.
+        /// </summary>
+        public static MethodExpression Instance = new MethodExpression();
+
+        /// <summary>
+        /// Private constructor.
+        /// </summary>
+        private MethodExpression()
+        {
+        }
     }
-}
+}

src/Microsoft.OpenApi/Expressions/PathExpression.cs

@@ -36,5 +36,16 @@ public override string Expression
                 return Path + Value;
             }
         }
+
+        /// <summary>
+        /// Gets the name string.
+        /// </summary>
+        public string Name
+        {
+            get
+            {
+                return Value;
+            }
+        }
     }
-}
+}

src/Microsoft.OpenApi/Expressions/QueryExpression.cs

@@ -36,5 +36,16 @@ public override string Expression
                 return Query + Value;
             }
         }
+
+        /// <summary>
+        /// Gets the name string.
+        /// </summary>
+        public string Name
+        {
+            get
+            {
+                return Value;
+            }
+        }
     }
-}
+}

src/Microsoft.OpenApi/Expressions/RequestExpression.cs

@@ -32,4 +32,4 @@ public RequestExpression(SourceExpression source)
         /// </summary>
         public SourceExpression Source { get; }
     }
-}
+}

src/Microsoft.OpenApi/Expressions/ResponseExpression.cs

@@ -32,4 +32,4 @@ public ResponseExpression(SourceExpression source)
         /// </summary>
         public SourceExpression Source { get; }
     }
-}
+}

src/Microsoft.OpenApi/Expressions/RuntimeExpression.cs

@@ -42,19 +42,19 @@ public static RuntimeExpression Build(string expression)
             // $url
             if (expression == UrlExpression.Url)
             {
-                return new UrlExpression();
+                return UrlExpression.Instance;
             }
 
             // $method
             if (expression == MethodExpression.Method)
             {
-                return new MethodExpression();
+                return MethodExpression.Instance;
             }
 
             // $statusCode
             if (expression == StatusCodeExpression.StatusCode)
             {
-                return new StatusCodeExpression();
+                return StatusCodeExpression.Instance;
             }
 
             // $request.
@@ -99,5 +99,11 @@ public bool Equals(RuntimeExpression obj)
         {
             return obj != null && obj.Expression == Expression;
         }
+
+        /// <inheritdoc />
+        public override string ToString()
+        {
+            return Expression;
+        }
     }
-}
+}

src/Microsoft.OpenApi/Expressions/SourceExpression.cs

@@ -72,4 +72,4 @@ protected SourceExpression(string value)
             throw new OpenApiException(string.Format(SRResource.SourceExpressionHasInvalidFormat, expression));
         }
     }
-}
+}

src/Microsoft.OpenApi/Expressions/StatusCodeExpression.cs

@@ -17,5 +17,17 @@ public sealed class StatusCodeExpression : RuntimeExpression
         /// Gets the expression string.
         /// </summary>
         public override string Expression { get; } = StatusCode;
+
+        /// <summary>
+        /// Gets the singleton.
+        /// </summary>
+        public static StatusCodeExpression Instance = new StatusCodeExpression();
+
+        /// <summary>
+        /// Private constructor.
+        /// </summary>
+        private StatusCodeExpression()
+        {
+        }
     }
-}
+}