Merge remote-tracking branch 'origin/master' into feature/stream-file-param-decorator

# Conflicts:
#	src/metadata/parameterGenerator.ts

Author: t.chambard

src/metadata/parameterGenerator.ts

@@ -1,7 +1,7 @@
-import * as ts from 'typescript';
-import { getDecoratorName, getDecoratorOptions, getDecoratorTextValue } from '../utils/decoratorUtils';
 import { MetadataGenerator, Parameter, Type } from './metadataGenerator';
-import { getCommonPrimitiveAndArrayUnionType, getLiteralValue, resolveType } from './resolveType';
+import { resolveType, getCommonPrimitiveAndArrayUnionType, getLiteralValue } from './resolveType';
+import { getDecoratorName, getDecoratorTextValue, getDecoratorOptions } from '../utils/decoratorUtils';
+import * as ts from 'typescript';
 
 export class ParameterGenerator {
     constructor(

test/data/apis.ts

@@ -387,6 +387,18 @@ export class ParameterizedEndpoint {
     stream(@swagger.StreamFileParam('stream') file: Express.Multer.File): PrimitiveClassModel {
         return new PrimitiveClassModel();
     }
+
+    @Path('/file')
+    @POST
+    file(@FileParam('file') file: Express.Multer.File): PrimitiveClassModel {
+        return new PrimitiveClassModel();
+    }
+
+    @Path('/stream')
+    @POST
+    stream(@swagger.StreamFileParam('stream') file: Express.Multer.File): PrimitiveClassModel {
+        return new PrimitiveClassModel();
+    }
 }
 
 export abstract class Entity {