Merge pull request Azure#148 from Azure/daschult/removeIsStream

Remove isStream() check
sarangan12 · Jun 5, 2018 · d58205b · d58205b
2 parents db9ae54 + 4e90721
commit d58205b
Show file tree

Hide file tree

Showing 5 changed files with 889 additions and 66 deletions.
diff --git a/package.json b/package.json
@@ -37,7 +37,7 @@
   },
   "homepage": "https://github.com/Azure/autorest.typescript/blob/master/README.md",
   "devDependencies": {
-    "@microsoft.azure/autorest.testserver": "^2.5.12",
+    "@microsoft.azure/autorest.testserver": "^2.5.13",
     "@types/assert": "0.0.31",
     "@types/express": "^4.11.1",
     "@types/fork-ts-checker-webpack-plugin": "^0.4.0",

diff --git a/src/vanilla/ClientModelExtensions.cs b/src/vanilla/ClientModelExtensions.cs
@@ -140,7 +140,7 @@ private static string ValidatePrimaryType(this PrimaryType primary, IChild scope
                     return ConstructValidationCheck(builder, requiredTypeErrorMessage, valueReference, primary.Name).ToString();
                 }
 
-                builder.AppendLine("if ({0} !== null && {0} !== undefined && msRest.isStream({0})) {{", valueReference);
+                builder.AppendLine("if ({0} !== null && {0} !== undefined) {{", valueReference);
                 return ConstructValidationCheck(builder, typeErrorMessage, valueReference, primary.Name).ToString();
             }
             else if (primary.KnownPrimaryType == KnownPrimaryType.String)

diff --git a/test/azure/generated/Paging/models/index.ts b/test/azure/generated/Paging/models/index.ts
@@ -136,6 +136,26 @@ export interface CustomParameterGroup {
   tenant: string;
 }
 
+/**
+ * @interface
+ * An interface representing PagingGetMultiplePagesLROOptions.
+ * Additional parameters for getMultiplePagesLRO operation.
+ *
+ */
+export interface PagingGetMultiplePagesLROOptions {
+  /**
+   * @member {number} [maxresults] Sets the maximum number of items to return
+   * in the response.
+   */
+  maxresults?: number;
+  /**
+   * @member {number} [timeout] Sets the maximum time that the server can spend
+   * processing the request, in seconds. The default is 30 seconds. Default
+   * value: 30 .
+   */
+  timeout?: number;
+}
+
 /**
  * @interface
  * An interface representing PagingGetMultiplePagesWithOffsetNextOptions.
@@ -209,6 +229,44 @@ export interface PagingGetMultiplePagesWithOffsetOptionalParams extends msRest.R
   clientRequestId?: string;
 }
 
+/**
+ * @interface
+ * An interface representing PagingGetMultiplePagesLROOptionalParams.
+ * Optional Parameters.
+ *
+ * @extends RequestOptionsBase
+ */
+export interface PagingGetMultiplePagesLROOptionalParams extends msRest.RequestOptionsBase {
+  /**
+   * @member {string} [clientRequestId]
+   */
+  clientRequestId?: string;
+  /**
+   * @member {PagingGetMultiplePagesLROOptions}
+   * [pagingGetMultiplePagesLROOptions] Additional parameters for the operation
+   */
+  pagingGetMultiplePagesLROOptions?: PagingGetMultiplePagesLROOptions;
+}
+
+/**
+ * @interface
+ * An interface representing PagingBeginGetMultiplePagesLROOptionalParams.
+ * Optional Parameters.
+ *
+ * @extends RequestOptionsBase
+ */
+export interface PagingBeginGetMultiplePagesLROOptionalParams extends msRest.RequestOptionsBase {
+  /**
+   * @member {string} [clientRequestId]
+   */
+  clientRequestId?: string;
+  /**
+   * @member {PagingGetMultiplePagesLROOptions}
+   * [pagingGetMultiplePagesLROOptions] Additional parameters for the operation
+   */
+  pagingGetMultiplePagesLROOptions?: PagingGetMultiplePagesLROOptions;
+}
+
 /**
  * @interface
  * An interface representing PagingGetMultiplePagesNextOptionalParams.
@@ -268,6 +326,44 @@ export interface PagingGetMultiplePagesWithOffsetNextOptionalParams extends msRe
   pagingGetMultiplePagesWithOffsetNextOptions?: PagingGetMultiplePagesWithOffsetNextOptions;
 }
 
+/**
+ * @interface
+ * An interface representing PagingGetMultiplePagesLRONextOptionalParams.
+ * Optional Parameters.
+ *
+ * @extends RequestOptionsBase
+ */
+export interface PagingGetMultiplePagesLRONextOptionalParams extends msRest.RequestOptionsBase {
+  /**
+   * @member {string} [clientRequestId]
+   */
+  clientRequestId?: string;
+  /**
+   * @member {PagingGetMultiplePagesLROOptions}
+   * [pagingGetMultiplePagesLROOptions] Additional parameters for the operation
+   */
+  pagingGetMultiplePagesLROOptions?: PagingGetMultiplePagesLROOptions;
+}
+
+/**
+ * @interface
+ * An interface representing PagingBeginGetMultiplePagesLRONextOptionalParams.
+ * Optional Parameters.
+ *
+ * @extends RequestOptionsBase
+ */
+export interface PagingBeginGetMultiplePagesLRONextOptionalParams extends msRest.RequestOptionsBase {
+  /**
+   * @member {string} [clientRequestId]
+   */
+  clientRequestId?: string;
+  /**
+   * @member {PagingGetMultiplePagesLROOptions}
+   * [pagingGetMultiplePagesLROOptions] Additional parameters for the operation
+   */
+  pagingGetMultiplePagesLROOptions?: PagingGetMultiplePagesLROOptions;
+}
+
 
 /**
  * @interface

diff --git a/test/azure/generated/Paging/models/mappers.ts b/test/azure/generated/Paging/models/mappers.ts
@@ -155,6 +155,26 @@ export const CustomParameterGroup = {
   }
 };
 
+export const PagingGetMultiplePagesLROOptions = {
+  type: {
+    name: "Composite",
+    className: "PagingGetMultiplePagesLROOptions",
+    modelProperties: {
+      maxresults: {
+        type: {
+          name: "Number"
+        }
+      },
+      timeout: {
+        defaultValue: 30,
+        type: {
+          name: "Number"
+        }
+      }
+    }
+  }
+};
+
 export const PagingGetMultiplePagesWithOffsetNextOptions = {
   type: {
     name: "Composite",
@@ -237,6 +257,52 @@ export const PagingGetMultiplePagesWithOffsetOptionalParams = {
   }
 };
 
+export const PagingGetMultiplePagesLROOptionalParams = {
+  serializedName: "GetMultiplePagesLROOptions",
+  type: {
+    name: "Composite",
+    className: "PagingGetMultiplePagesLROOptionalParams",
+    modelProperties: {
+      clientRequestId: {
+        serializedName: "client-request-id",
+        type: {
+          name: "String"
+        }
+      },
+      pagingGetMultiplePagesLROOptions: {
+        serializedName: "",
+        type: {
+          name: "Composite",
+          className: "PagingGetMultiplePagesLROOptions"
+        }
+      }
+    }
+  }
+};
+
+export const PagingBeginGetMultiplePagesLROOptionalParams = {
+  serializedName: "BeginGetMultiplePagesLROOptions",
+  type: {
+    name: "Composite",
+    className: "PagingBeginGetMultiplePagesLROOptionalParams",
+    modelProperties: {
+      clientRequestId: {
+        serializedName: "client-request-id",
+        type: {
+          name: "String"
+        }
+      },
+      pagingGetMultiplePagesLROOptions: {
+        serializedName: "",
+        type: {
+          name: "Composite",
+          className: "PagingGetMultiplePagesLROOptions"
+        }
+      }
+    }
+  }
+};
+
 export const PagingGetMultiplePagesNextOptionalParams = {
   serializedName: "GetMultiplePagesNextOptions",
   type: {
@@ -306,6 +372,52 @@ export const PagingGetMultiplePagesWithOffsetNextOptionalParams = {
   }
 };
 
+export const PagingGetMultiplePagesLRONextOptionalParams = {
+  serializedName: "GetMultiplePagesLRONextOptions",
+  type: {
+    name: "Composite",
+    className: "PagingGetMultiplePagesLRONextOptionalParams",
+    modelProperties: {
+      clientRequestId: {
+        serializedName: "client-request-id",
+        type: {
+          name: "String"
+        }
+      },
+      pagingGetMultiplePagesLROOptions: {
+        serializedName: "",
+        type: {
+          name: "Composite",
+          className: "PagingGetMultiplePagesLROOptions"
+        }
+      }
+    }
+  }
+};
+
+export const PagingBeginGetMultiplePagesLRONextOptionalParams = {
+  serializedName: "BeginGetMultiplePagesLRONextOptions",
+  type: {
+    name: "Composite",
+    className: "PagingBeginGetMultiplePagesLRONextOptionalParams",
+    modelProperties: {
+      clientRequestId: {
+        serializedName: "client-request-id",
+        type: {
+          name: "String"
+        }
+      },
+      pagingGetMultiplePagesLROOptions: {
+        serializedName: "",
+        type: {
+          name: "Composite",
+          className: "PagingGetMultiplePagesLROOptions"
+        }
+      }
+    }
+  }
+};
+
 export const ProductResult = {
   serializedName: "ProductResult",
   type: {