diff --git a/modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java b/modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java
index aca8bbf673c..1755e67750f 100644
--- a/modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java
+++ b/modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java
@@ -310,7 +310,10 @@ public class CodeGenMojo extends AbstractMojo {
         }
 
         if (addCompileSourceRoot) {
-            String sourceJavaFolder = output.toString() + "/" + configOptions.get(CodegenConstants.SOURCE_FOLDER);
+            final Object sourceFolderObject = configOptions.get(CodegenConstants.SOURCE_FOLDER);
+            final String sourceFolder =  sourceFolderObject == null ? "src/main/java" : sourceFolderObject.toString();
+
+            String sourceJavaFolder = output.toString() + "/" + sourceFolder;
             project.addCompileSourceRoot(sourceJavaFolder);
         }
     }
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
index 23bfb825bea..63cad401d02 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
@@ -1892,7 +1892,11 @@ public class DefaultCodegen {
             for (String key : consumes) {
                 Map<String, String> mediaType = new HashMap<String, String>();
                 // escape quotation to avoid code injection
-                mediaType.put("mediaType", escapeText(escapeQuotationMark(key)));
+                if ("*/*".equals(key)) { // "*/*" is a special case, do nothing
+                    mediaType.put("mediaType", key);
+                } else {
+                    mediaType.put("mediaType", escapeText(escapeQuotationMark(key)));
+                }
                 count += 1;
                 if (count < consumes.size()) {
                     mediaType.put("hasMore", "true");
@@ -1926,7 +1930,11 @@ public class DefaultCodegen {
             for (String key : produces) {
                 Map<String, String> mediaType = new HashMap<String, String>();
                 // escape quotation to avoid code injection
-                mediaType.put("mediaType", escapeText(escapeQuotationMark(key)));
+                if ("*/*".equals(key)) { // "*/*" is a special case, do nothing
+                    mediaType.put("mediaType", key);
+                } else {
+                    mediaType.put("mediaType", escapeText(escapeQuotationMark(key)));
+                }
                 count += 1;
                 if (count < produces.size()) {
                     mediaType.put("hasMore", "true");
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
index fd893f5d52f..a2e7f597c43 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
@@ -141,7 +141,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
         config.additionalProperties().put("generatedDate", DateTime.now().toString());
         config.additionalProperties().put("generatorClass", config.getClass().toString());
         config.additionalProperties().put("inputSpec", config.getInputSpec());
-        
+
         if (swagger.getInfo() != null) {
             Info info = swagger.getInfo();
             if (info.getTitle() != null) {
@@ -405,6 +405,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
                     operation.put("classname", config.toApiName(tag));
                     operation.put("classVarName", config.toApiVarName(tag));
                     operation.put("importPath", config.toApiImport(tag));
+                    operation.put("classFilename", config.toApiFilename(tag));
 
                     if(!config.vendorExtensions().isEmpty()) {
                     	operation.put("vendorExtensions", config.vendorExtensions());
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AspNet5ServerCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AspNet5ServerCodegen.java
index d22e18f2cd0..83bbfbb6adb 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AspNet5ServerCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AspNet5ServerCodegen.java
@@ -10,6 +10,8 @@ public class AspNet5ServerCodegen extends AspNetCoreServerCodegen {
 
     public AspNet5ServerCodegen() {
         super();
+
+        embeddedTemplateDir = templateDir = "aspnetcore";
     }
 
     @Override
diff --git a/modules/swagger-codegen/src/main/resources/Java/pojo.mustache b/modules/swagger-codegen/src/main/resources/Java/pojo.mustache
index 4e706ed7d4c..408c6dbe645 100644
--- a/modules/swagger-codegen/src/main/resources/Java/pojo.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/pojo.mustache
@@ -63,12 +63,9 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#parcela
   {{/maximum}}
    * @return {{name}}
   **/
- {{#vendorExtensions.extraAnnotation}}
-  {{{vendorExtensions.extraAnnotation}}}
-  {{/vendorExtensions.extraAnnotation}}
 {{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  @ApiModelProperty({{#example}}example = "{{example}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
 {{#vendorExtensions.extraAnnotation}}
-  {{vendorExtensions.extraAnnotation}}
+  {{{vendorExtensions.extraAnnotation}}}
 {{/vendorExtensions.extraAnnotation}}
   public {{{datatypeWithEnum}}} {{getter}}() {
     return {{name}};
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/enumClass.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/enumClass.mustache
index 94212231156..10bb9d0f4e0 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/enumClass.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/enumClass.mustache
@@ -1,9 +1,9 @@
 @XmlType(name="{{datatypeWithEnum}}")
-@XmlEnum
+@XmlEnum({{datatype}}.class)
 public enum {{datatypeWithEnum}} {
 
     {{#allowableValues}}
-    {{#enumVars}}{{name}}({{datatype}}.valueOf({{{value}}})){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}
+    {{#enumVars}}@XmlEnumValue({{{value}}}) {{name}}({{datatype}}.valueOf({{{value}}})){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}
     {{/allowableValues}}
 
 
@@ -17,7 +17,17 @@ public enum {{datatypeWithEnum}} {
         return value;
     }
 
+    @Override
+    public String toString() {
+        return String.valueOf(value);
+    }
+
     public static {{datatypeWithEnum}} fromValue(String v) {
-        return valueOf(v);
+        for ({{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} b : {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}.values()) {
+            if (String.valueOf(b.value).equals(v)) {
+                return b;
+            }
+        }
+        return null;
     }
 }
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache
index 382b8372daa..9f00536089c 100644
--- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache
+++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pojo.mustache
@@ -5,6 +5,7 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
 
 @XmlAccessorType(XmlAccessType.FIELD)
 {{#hasVars}} @XmlType(name = "{{classname}}", propOrder =
diff --git a/modules/swagger-codegen/src/main/resources/MSF4J/api.mustache b/modules/swagger-codegen/src/main/resources/MSF4J/api.mustache
index f90d2564187..8a04d1cad7e 100644
--- a/modules/swagger-codegen/src/main/resources/MSF4J/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/MSF4J/api.mustache
@@ -15,8 +15,8 @@ import {{package}}.NotFoundException;
 
 import java.io.InputStream;
 
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
-import org.glassfish.jersey.media.multipart.FormDataParam;
+import org.wso2.msf4j.formparam.FormDataParam;
+import org.wso2.msf4j.formparam.FileInfo;
 
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.Response;
diff --git a/modules/swagger-codegen/src/main/resources/MSF4J/apiService.mustache b/modules/swagger-codegen/src/main/resources/MSF4J/apiService.mustache
index edaa0f9becb..ca5e8d34968 100644
--- a/modules/swagger-codegen/src/main/resources/MSF4J/apiService.mustache
+++ b/modules/swagger-codegen/src/main/resources/MSF4J/apiService.mustache
@@ -3,7 +3,8 @@ package {{package}};
 import {{package}}.*;
 import {{modelPackage}}.*;
 
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.wso2.msf4j.formparam.FormDataParam;
+import org.wso2.msf4j.formparam.FileInfo;
 
 {{#imports}}import {{import}};
 {{/imports}}
diff --git a/modules/swagger-codegen/src/main/resources/MSF4J/apiServiceImpl.mustache b/modules/swagger-codegen/src/main/resources/MSF4J/apiServiceImpl.mustache
index af1b56fc69c..7b66d35361b 100644
--- a/modules/swagger-codegen/src/main/resources/MSF4J/apiServiceImpl.mustache
+++ b/modules/swagger-codegen/src/main/resources/MSF4J/apiServiceImpl.mustache
@@ -11,7 +11,8 @@ import {{package}}.NotFoundException;
 
 import java.io.InputStream;
 
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.wso2.msf4j.formparam.FormDataParam;
+import org.wso2.msf4j.formparam.FileInfo;
 
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
diff --git a/modules/swagger-codegen/src/main/resources/MSF4J/formParams.mustache b/modules/swagger-codegen/src/main/resources/MSF4J/formParams.mustache
index 9a7ff6ea6cf..249266065db 100644
--- a/modules/swagger-codegen/src/main/resources/MSF4J/formParams.mustache
+++ b/modules/swagger-codegen/src/main/resources/MSF4J/formParams.mustache
@@ -1,3 +1,3 @@
 {{#isFormParam}}{{#notFile}}@ApiParam(value = "{{{description}}}"{{#required}}, required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}){{#vendorExtensions.x-multipart}}@FormDataParam("{{paramName}}")  {{{dataType}}} {{paramName}}{{/vendorExtensions.x-multipart}}{{^vendorExtensions.x-multipart}} {{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} @FormParam("{{baseName}}")  {{{dataType}}} {{paramName}}{{/vendorExtensions.x-multipart}}{{/notFile}}{{#isFile}}
             @FormDataParam("{{paramName}}") InputStream {{paramName}}InputStream,
-            @FormDataParam("{{paramName}}") FormDataContentDisposition {{paramName}}Detail{{/isFile}}{{/isFormParam}}
+            @FormDataParam("{{paramName}}") FileInfo {{paramName}}Detail{{/isFile}}{{/isFormParam}}
diff --git a/modules/swagger-codegen/src/main/resources/MSF4J/pom.mustache b/modules/swagger-codegen/src/main/resources/MSF4J/pom.mustache
index ff9764e8e95..7839f9c1ec2 100644
--- a/modules/swagger-codegen/src/main/resources/MSF4J/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/MSF4J/pom.mustache
@@ -66,16 +66,6 @@
             <artifactId>jackson-datatype-joda</artifactId>
             <version>2.4.1</version>
         </dependency> 
-    <dependency>
-      <groupId>org.glassfish.jersey.containers</groupId>
-      <artifactId>jersey-container-servlet-core</artifactId>
-      <version>${jersey2-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish.jersey.media</groupId>
-      <artifactId>jersey-media-multipart</artifactId>
-      <version>${jersey2-version}</version>
-    </dependency> 
 </dependencies>
  
   <repositories>
diff --git a/modules/swagger-codegen/src/main/resources/MSF4J/serviceFormParams.mustache b/modules/swagger-codegen/src/main/resources/MSF4J/serviceFormParams.mustache
index dc2d2eb1ecf..c58393551df 100644
--- a/modules/swagger-codegen/src/main/resources/MSF4J/serviceFormParams.mustache
+++ b/modules/swagger-codegen/src/main/resources/MSF4J/serviceFormParams.mustache
@@ -1 +1 @@
-{{#isFormParam}}{{#notFile}}{{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}}InputStream {{paramName}}InputStream, FormDataContentDisposition {{paramName}}Detail{{/isFile}}{{/isFormParam}}
\ No newline at end of file
+{{#isFormParam}}{{#notFile}}{{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}}InputStream {{paramName}}InputStream, FileInfo {{paramName}}Detail{{/isFile}}{{/isFormParam}}
diff --git a/modules/swagger-codegen/src/main/resources/dart/apilib.mustache b/modules/swagger-codegen/src/main/resources/dart/apilib.mustache
index f608cf214e0..07b02ef6105 100644
--- a/modules/swagger-codegen/src/main/resources/dart/apilib.mustache
+++ b/modules/swagger-codegen/src/main/resources/dart/apilib.mustache
@@ -16,7 +16,7 @@ part 'auth/api_key_auth.dart';
 part 'auth/oauth.dart';
 part 'auth/http_basic_auth.dart';
 
-{{#apiInfo}}{{#apis}}part 'api/{{classVarName}}_api.dart';
+{{#apiInfo}}{{#apis}}part 'api/{{classFilename}}.dart';
 {{/apis}}{{/apiInfo}}
 {{#models}}{{#model}}part 'model/{{classFilename}}.dart';
 {{/model}}{{/models}}
diff --git a/modules/swagger-codegen/src/main/resources/objc/model-body.mustache b/modules/swagger-codegen/src/main/resources/objc/model-body.mustache
index 5ca9303e5a8..8307a28d54a 100644
--- a/modules/swagger-codegen/src/main/resources/objc/model-body.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/model-body.mustache
@@ -43,7 +43,7 @@
  * This method is used by `JSONModel`.
  */
 + (JSONKeyMapper *)keyMapper {
-  return [[JSONKeyMapper alloc] initWithDictionary:@{ {{#vars}}@"{{baseName}}": @"{{name}}"{{#hasMore}}, {{/hasMore}}{{/vars}} }];
+  return [[JSONKeyMapper alloc] initWithModelToJSONDictionary:@{ {{#vars}}@"{{name}}": @"{{baseName}}"{{#hasMore}}, {{/hasMore}}{{/vars}} }];
 }
 
 /**
diff --git a/modules/swagger-codegen/src/main/resources/objc/podspec.mustache b/modules/swagger-codegen/src/main/resources/objc/podspec.mustache
index 93b3303ec31..1506c220e00 100644
--- a/modules/swagger-codegen/src/main/resources/objc/podspec.mustache
+++ b/modules/swagger-codegen/src/main/resources/objc/podspec.mustache
@@ -31,7 +31,7 @@ Pod::Spec.new do |s|
 {{#useCoreData}}    s.resources      = '{{podName}}/**/*.{xcdatamodeld,xcdatamodel}'{{/useCoreData}}
 
     s.dependency 'AFNetworking', '~> 3.1'
-    s.dependency 'JSONModel', '~> 1.2'
+    s.dependency 'JSONModel', '~> 1.4'
     s.dependency 'ISO8601', '~> 0.5'
 end
 
diff --git a/modules/swagger-codegen/src/main/resources/python/api_client.mustache b/modules/swagger-codegen/src/main/resources/python/api_client.mustache
index 0a5864a81af..dc4fe509f62 100644
--- a/modules/swagger-codegen/src/main/resources/python/api_client.mustache
+++ b/modules/swagger-codegen/src/main/resources/python/api_client.mustache
@@ -462,7 +462,7 @@ class ApiClient(object):
 
         content_types = list(map(lambda x: x.lower(), content_types))
 
-        if 'application/json' in content_types:
+        if 'application/json' in content_types or '*/*' in content_types:
             return 'application/json'
         else:
             return content_types[0]
diff --git a/modules/swagger-codegen/src/main/resources/ruby/api_client.mustache b/modules/swagger-codegen/src/main/resources/ruby/api_client.mustache
index fcd4b3eebfa..7fa611e3744 100644
--- a/modules/swagger-codegen/src/main/resources/ruby/api_client.mustache
+++ b/modules/swagger-codegen/src/main/resources/ruby/api_client.mustache
@@ -125,10 +125,11 @@ module {{moduleName}}
     #   application/json
     #   application/json; charset=UTF8
     #   APPLICATION/JSON
+    #   */*
     # @param [String] mime MIME
     # @return [Boolean] True if the MIME is application/json
     def json_mime?(mime)
-       !(mime =~ /\Aapplication\/json(;.*)?\z/i).nil?
+       (mime == "*/*") || !(mime =~ /\Aapplication\/json(;.*)?\z/i).nil?
     end
 
     # Deserialize the response to the given return type.
diff --git a/modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
index c42dc774a22..4666a0cc167 100644
--- a/modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
+++ b/modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
@@ -590,9 +590,9 @@ paths:
       descriptions: To test enum parameters
       operationId: testEnumParameters
       consumes:
-        - application/json
+        - "*/*"
       produces:
-        - application/json
+        - "*/*"
       parameters:
         - name: enum_form_string_array
           type: array
diff --git a/samples/client/petstore/objc/default/SwaggerClient/Model/SWGCategory.m b/samples/client/petstore/objc/default/SwaggerClient/Model/SWGCategory.m
index 00745d1f499..21e354b30e9 100644
--- a/samples/client/petstore/objc/default/SwaggerClient/Model/SWGCategory.m
+++ b/samples/client/petstore/objc/default/SwaggerClient/Model/SWGCategory.m
@@ -17,7 +17,7 @@
  * This method is used by `JSONModel`.
  */
 + (JSONKeyMapper *)keyMapper {
-  return [[JSONKeyMapper alloc] initWithDictionary:@{ @"id": @"_id", @"name": @"name" }];
+  return [[JSONKeyMapper alloc] initWithModelToJSONDictionary:@{ @"_id": @"id", @"name": @"name" }];
 }
 
 /**
diff --git a/samples/client/petstore/objc/default/SwaggerClient/Model/SWGOrder.m b/samples/client/petstore/objc/default/SwaggerClient/Model/SWGOrder.m
index e0b44e06954..7f93b0212c4 100644
--- a/samples/client/petstore/objc/default/SwaggerClient/Model/SWGOrder.m
+++ b/samples/client/petstore/objc/default/SwaggerClient/Model/SWGOrder.m
@@ -17,7 +17,7 @@
  * This method is used by `JSONModel`.
  */
 + (JSONKeyMapper *)keyMapper {
-  return [[JSONKeyMapper alloc] initWithDictionary:@{ @"id": @"_id", @"petId": @"petId", @"quantity": @"quantity", @"shipDate": @"shipDate", @"status": @"status", @"complete": @"complete" }];
+  return [[JSONKeyMapper alloc] initWithModelToJSONDictionary:@{ @"_id": @"id", @"petId": @"petId", @"quantity": @"quantity", @"shipDate": @"shipDate", @"status": @"status", @"complete": @"complete" }];
 }
 
 /**
diff --git a/samples/client/petstore/objc/default/SwaggerClient/Model/SWGPet.m b/samples/client/petstore/objc/default/SwaggerClient/Model/SWGPet.m
index a1c63520dc4..8c958695c88 100644
--- a/samples/client/petstore/objc/default/SwaggerClient/Model/SWGPet.m
+++ b/samples/client/petstore/objc/default/SwaggerClient/Model/SWGPet.m
@@ -17,7 +17,7 @@
  * This method is used by `JSONModel`.
  */
 + (JSONKeyMapper *)keyMapper {
-  return [[JSONKeyMapper alloc] initWithDictionary:@{ @"id": @"_id", @"category": @"category", @"name": @"name", @"photoUrls": @"photoUrls", @"tags": @"tags", @"status": @"status" }];
+  return [[JSONKeyMapper alloc] initWithModelToJSONDictionary:@{ @"_id": @"id", @"category": @"category", @"name": @"name", @"photoUrls": @"photoUrls", @"tags": @"tags", @"status": @"status" }];
 }
 
 /**
diff --git a/samples/client/petstore/objc/default/SwaggerClient/Model/SWGTag.m b/samples/client/petstore/objc/default/SwaggerClient/Model/SWGTag.m
index e71829873d1..3a62bcbb9a1 100644
--- a/samples/client/petstore/objc/default/SwaggerClient/Model/SWGTag.m
+++ b/samples/client/petstore/objc/default/SwaggerClient/Model/SWGTag.m
@@ -17,7 +17,7 @@
  * This method is used by `JSONModel`.
  */
 + (JSONKeyMapper *)keyMapper {
-  return [[JSONKeyMapper alloc] initWithDictionary:@{ @"id": @"_id", @"name": @"name" }];
+  return [[JSONKeyMapper alloc] initWithModelToJSONDictionary:@{ @"_id": @"id", @"name": @"name" }];
 }
 
 /**
diff --git a/samples/client/petstore/objc/default/SwaggerClient/Model/SWGUser.m b/samples/client/petstore/objc/default/SwaggerClient/Model/SWGUser.m
index c8195660df6..fd50c02e2c9 100644
--- a/samples/client/petstore/objc/default/SwaggerClient/Model/SWGUser.m
+++ b/samples/client/petstore/objc/default/SwaggerClient/Model/SWGUser.m
@@ -17,7 +17,7 @@
  * This method is used by `JSONModel`.
  */
 + (JSONKeyMapper *)keyMapper {
-  return [[JSONKeyMapper alloc] initWithDictionary:@{ @"id": @"_id", @"username": @"username", @"firstName": @"firstName", @"lastName": @"lastName", @"email": @"email", @"password": @"password", @"phone": @"phone", @"userStatus": @"userStatus" }];
+  return [[JSONKeyMapper alloc] initWithModelToJSONDictionary:@{ @"_id": @"id", @"username": @"username", @"firstName": @"firstName", @"lastName": @"lastName", @"email": @"email", @"password": @"password", @"phone": @"phone", @"userStatus": @"userStatus" }];
 }
 
 /**
diff --git a/samples/client/petstore/python/petstore_api/api_client.py b/samples/client/petstore/python/petstore_api/api_client.py
index adf66173dbc..bd57c1089a4 100644
--- a/samples/client/petstore/python/petstore_api/api_client.py
+++ b/samples/client/petstore/python/petstore_api/api_client.py
@@ -462,7 +462,7 @@ class ApiClient(object):
 
         content_types = list(map(lambda x: x.lower(), content_types))
 
-        if 'application/json' in content_types:
+        if 'application/json' in content_types or '*/*' in content_types:
             return 'application/json'
         else:
             return content_types[0]
diff --git a/samples/client/petstore/ruby/docs/FakeApi.md b/samples/client/petstore/ruby/docs/FakeApi.md
index 1524d9c915f..971fdadb1ae 100644
--- a/samples/client/petstore/ruby/docs/FakeApi.md
+++ b/samples/client/petstore/ruby/docs/FakeApi.md
@@ -191,8 +191,8 @@ No authorization required
 
 ### HTTP request headers
 
- - **Content-Type**: application/json
- - **Accept**: application/json
+ - **Content-Type**: */*
+ - **Accept**: */*
 
 
 
diff --git a/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb b/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb
index 3500dfbb52f..a9c7cf07710 100644
--- a/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb
@@ -306,11 +306,11 @@ module Petstore
       header_params = {}
 
       # HTTP header 'Accept' (if needed)
-      local_header_accept = ['application/json']
+      local_header_accept = ['*/*']
       local_header_accept_result = @api_client.select_header_accept(local_header_accept) and header_params['Accept'] = local_header_accept_result
 
       # HTTP header 'Content-Type'
-      local_header_content_type = ['application/json']
+      local_header_content_type = ['*/*']
       header_params['Content-Type'] = @api_client.select_header_content_type(local_header_content_type)
       header_params[:'enum_header_string_array'] = @api_client.build_collection_param(opts[:'enum_header_string_array'], :csv) if !opts[:'enum_header_string_array'].nil?
       header_params[:'enum_header_string'] = opts[:'enum_header_string'] if !opts[:'enum_header_string'].nil?
diff --git a/samples/client/petstore/ruby/lib/petstore/api_client.rb b/samples/client/petstore/ruby/lib/petstore/api_client.rb
index 0a95711ce43..64cc2e286c2 100644
--- a/samples/client/petstore/ruby/lib/petstore/api_client.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api_client.rb
@@ -142,10 +142,11 @@ module Petstore
     #   application/json
     #   application/json; charset=UTF8
     #   APPLICATION/JSON
+    #   */*
     # @param [String] mime MIME
     # @return [Boolean] True if the MIME is application/json
     def json_mime?(mime)
-       !(mime =~ /\Aapplication\/json(;.*)?\z/i).nil?
+       (mime == "*/*") || !(mime =~ /\Aapplication\/json(;.*)?\z/i).nil?
     end
 
     # Deserialize the response to the given return type.
diff --git a/samples/server/petstore/java-msf4j/pom.xml b/samples/server/petstore/java-msf4j/pom.xml
index b408c98d9e1..b7c61004bac 100644
--- a/samples/server/petstore/java-msf4j/pom.xml
+++ b/samples/server/petstore/java-msf4j/pom.xml
@@ -66,16 +66,6 @@
             <artifactId>jackson-datatype-joda</artifactId>
             <version>2.4.1</version>
         </dependency> 
-    <dependency>
-      <groupId>org.glassfish.jersey.containers</groupId>
-      <artifactId>jersey-container-servlet-core</artifactId>
-      <version>${jersey2-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish.jersey.media</groupId>
-      <artifactId>jersey-media-multipart</artifactId>
-      <version>${jersey2-version}</version>
-    </dependency> 
 </dependencies>
  
   <repositories>
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/FakeApi.java b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/FakeApi.java
index ca3257cd214..1ff18daec25 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/FakeApi.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/FakeApi.java
@@ -16,8 +16,8 @@ import io.swagger.api.NotFoundException;
 
 import java.io.InputStream;
 
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
-import org.glassfish.jersey.media.multipart.FormDataParam;
+import org.wso2.msf4j.formparam.FormDataParam;
+import org.wso2.msf4j.formparam.FileInfo;
 
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.Response;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/FakeApiService.java b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/FakeApiService.java
index ae97d88b73a..33a0ff02d3c 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/FakeApiService.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/FakeApiService.java
@@ -3,7 +3,8 @@ package io.swagger.api;
 import io.swagger.api.*;
 import io.swagger.model.*;
 
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.wso2.msf4j.formparam.FormDataParam;
+import org.wso2.msf4j.formparam.FileInfo;
 
 import io.swagger.model.Client;
 import java.util.Date;
@@ -19,7 +20,30 @@ import javax.ws.rs.core.SecurityContext;
 
 
 public abstract class FakeApiService {
-    public abstract Response testClientModel(Client body ) throws NotFoundException;
-    public abstract Response testEndpointParameters(BigDecimal number ,Double _double ,String patternWithoutDelimiter ,byte[] _byte ,Integer integer ,Integer int32 ,Long int64 ,Float _float ,String string ,byte[] binary ,Date date ,Date dateTime ,String password ,String paramCallback ) throws NotFoundException;
-    public abstract Response testEnumParameters(List<String> enumFormStringArray ,String enumFormString ,List<String> enumHeaderStringArray ,String enumHeaderString ,List<String> enumQueryStringArray ,String enumQueryString ,BigDecimal enumQueryInteger ,Double enumQueryDouble ) throws NotFoundException;
+    public abstract Response testClientModel(Client body
+ ) throws NotFoundException;
+    public abstract Response testEndpointParameters(BigDecimal number
+ ,Double _double
+ ,String patternWithoutDelimiter
+ ,byte[] _byte
+ ,Integer integer
+ ,Integer int32
+ ,Long int64
+ ,Float _float
+ ,String string
+ ,byte[] binary
+ ,Date date
+ ,Date dateTime
+ ,String password
+ ,String paramCallback
+ ) throws NotFoundException;
+    public abstract Response testEnumParameters(List<String> enumFormStringArray
+ ,String enumFormString
+ ,List<String> enumHeaderStringArray
+ ,String enumHeaderString
+ ,List<String> enumQueryStringArray
+ ,String enumQueryString
+ ,BigDecimal enumQueryInteger
+ ,Double enumQueryDouble
+ ) throws NotFoundException;
 }
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/PetApi.java b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/PetApi.java
index 641fcd6bd28..a6b77ddc778 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/PetApi.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/PetApi.java
@@ -16,8 +16,8 @@ import io.swagger.api.NotFoundException;
 
 import java.io.InputStream;
 
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
-import org.glassfish.jersey.media.multipart.FormDataParam;
+import org.wso2.msf4j.formparam.FormDataParam;
+import org.wso2.msf4j.formparam.FileInfo;
 
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.Response;
@@ -179,7 +179,7 @@ public class PetApi  {
 ,@ApiParam(value = "Additional data to pass to server")@FormDataParam("additionalMetadata")  String additionalMetadata
 ,
             @FormDataParam("file") InputStream fileInputStream,
-            @FormDataParam("file") FormDataContentDisposition fileDetail
+            @FormDataParam("file") FileInfo fileDetail
 )
     throws NotFoundException {
         return delegate.uploadFile(petId,additionalMetadata,fileInputStream, fileDetail);
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/PetApiService.java b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/PetApiService.java
index cc55195c9dc..f96a1305859 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/PetApiService.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/PetApiService.java
@@ -3,7 +3,8 @@ package io.swagger.api;
 import io.swagger.api.*;
 import io.swagger.model.*;
 
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.wso2.msf4j.formparam.FormDataParam;
+import org.wso2.msf4j.formparam.FileInfo;
 
 import io.swagger.model.Pet;
 import java.io.File;
@@ -19,12 +20,25 @@ import javax.ws.rs.core.SecurityContext;
 
 
 public abstract class PetApiService {
-    public abstract Response addPet(Pet body ) throws NotFoundException;
-    public abstract Response deletePet(Long petId ,String apiKey ) throws NotFoundException;
-    public abstract Response findPetsByStatus(List<String> status ) throws NotFoundException;
-    public abstract Response findPetsByTags(List<String> tags ) throws NotFoundException;
-    public abstract Response getPetById(Long petId ) throws NotFoundException;
-    public abstract Response updatePet(Pet body ) throws NotFoundException;
-    public abstract Response updatePetWithForm(Long petId ,String name ,String status ) throws NotFoundException;
-    public abstract Response uploadFile(Long petId ,String additionalMetadata ,InputStream fileInputStream, FormDataContentDisposition fileDetail ) throws NotFoundException;
+    public abstract Response addPet(Pet body
+ ) throws NotFoundException;
+    public abstract Response deletePet(Long petId
+ ,String apiKey
+ ) throws NotFoundException;
+    public abstract Response findPetsByStatus(List<String> status
+ ) throws NotFoundException;
+    public abstract Response findPetsByTags(List<String> tags
+ ) throws NotFoundException;
+    public abstract Response getPetById(Long petId
+ ) throws NotFoundException;
+    public abstract Response updatePet(Pet body
+ ) throws NotFoundException;
+    public abstract Response updatePetWithForm(Long petId
+ ,String name
+ ,String status
+ ) throws NotFoundException;
+    public abstract Response uploadFile(Long petId
+ ,String additionalMetadata
+ ,InputStream fileInputStream, FileInfo fileDetail
+ ) throws NotFoundException;
 }
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/StoreApi.java b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/StoreApi.java
index 4bd3369fb9c..6d6aa3848f7 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/StoreApi.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/StoreApi.java
@@ -15,8 +15,8 @@ import io.swagger.api.NotFoundException;
 
 import java.io.InputStream;
 
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
-import org.glassfish.jersey.media.multipart.FormDataParam;
+import org.wso2.msf4j.formparam.FormDataParam;
+import org.wso2.msf4j.formparam.FileInfo;
 
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.Response;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/StoreApiService.java b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/StoreApiService.java
index 40d6e37102a..58331f65bff 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/StoreApiService.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/StoreApiService.java
@@ -3,7 +3,8 @@ package io.swagger.api;
 import io.swagger.api.*;
 import io.swagger.model.*;
 
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.wso2.msf4j.formparam.FormDataParam;
+import org.wso2.msf4j.formparam.FileInfo;
 
 import java.util.Map;
 import io.swagger.model.Order;
@@ -18,8 +19,11 @@ import javax.ws.rs.core.SecurityContext;
 
 
 public abstract class StoreApiService {
-    public abstract Response deleteOrder(String orderId ) throws NotFoundException;
+    public abstract Response deleteOrder(String orderId
+ ) throws NotFoundException;
     public abstract Response getInventory() throws NotFoundException;
-    public abstract Response getOrderById(Long orderId ) throws NotFoundException;
-    public abstract Response placeOrder(Order body ) throws NotFoundException;
+    public abstract Response getOrderById(Long orderId
+ ) throws NotFoundException;
+    public abstract Response placeOrder(Order body
+ ) throws NotFoundException;
 }
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/UserApi.java b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/UserApi.java
index 6db93811a67..fe7159324b9 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/UserApi.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/UserApi.java
@@ -15,8 +15,8 @@ import io.swagger.api.NotFoundException;
 
 import java.io.InputStream;
 
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
-import org.glassfish.jersey.media.multipart.FormDataParam;
+import org.wso2.msf4j.formparam.FormDataParam;
+import org.wso2.msf4j.formparam.FileInfo;
 
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.Response;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/UserApiService.java b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/UserApiService.java
index 2d41ae3a61d..5042a551342 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/UserApiService.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/io/swagger/api/UserApiService.java
@@ -3,7 +3,8 @@ package io.swagger.api;
 import io.swagger.api.*;
 import io.swagger.model.*;
 
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.wso2.msf4j.formparam.FormDataParam;
+import org.wso2.msf4j.formparam.FileInfo;
 
 import io.swagger.model.User;
 import java.util.List;
@@ -18,12 +19,21 @@ import javax.ws.rs.core.SecurityContext;
 
 
 public abstract class UserApiService {
-    public abstract Response createUser(User body ) throws NotFoundException;
-    public abstract Response createUsersWithArrayInput(List<User> body ) throws NotFoundException;
-    public abstract Response createUsersWithListInput(List<User> body ) throws NotFoundException;
-    public abstract Response deleteUser(String username ) throws NotFoundException;
-    public abstract Response getUserByName(String username ) throws NotFoundException;
-    public abstract Response loginUser(String username ,String password ) throws NotFoundException;
+    public abstract Response createUser(User body
+ ) throws NotFoundException;
+    public abstract Response createUsersWithArrayInput(List<User> body
+ ) throws NotFoundException;
+    public abstract Response createUsersWithListInput(List<User> body
+ ) throws NotFoundException;
+    public abstract Response deleteUser(String username
+ ) throws NotFoundException;
+    public abstract Response getUserByName(String username
+ ) throws NotFoundException;
+    public abstract Response loginUser(String username
+ ,String password
+ ) throws NotFoundException;
     public abstract Response logoutUser() throws NotFoundException;
-    public abstract Response updateUser(String username ,User body ) throws NotFoundException;
+    public abstract Response updateUser(String username
+ ,User body
+ ) throws NotFoundException;
 }
diff --git a/samples/server/petstore/java-msf4j/src/main/java/io/swagger/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/java-msf4j/src/main/java/io/swagger/api/impl/FakeApiServiceImpl.java
index f4fb6865495..43e07c14462 100644
--- a/samples/server/petstore/java-msf4j/src/main/java/io/swagger/api/impl/FakeApiServiceImpl.java
+++ b/samples/server/petstore/java-msf4j/src/main/java/io/swagger/api/impl/FakeApiServiceImpl.java
@@ -12,7 +12,8 @@ import io.swagger.api.NotFoundException;
 
 import java.io.InputStream;
 
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.wso2.msf4j.formparam.FormDataParam;
+import org.wso2.msf4j.formparam.FileInfo;
 
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
@@ -20,17 +21,40 @@ import javax.ws.rs.core.SecurityContext;
 
 public class FakeApiServiceImpl extends FakeApiService {
     @Override
-    public Response testClientModel(Client body ) throws NotFoundException {
+    public Response testClientModel(Client body
+ ) throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
     @Override
-    public Response testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, byte[] binary, Date date, Date dateTime, String password, String paramCallback ) throws NotFoundException {
+    public Response testEndpointParameters(BigDecimal number
+, Double _double
+, String patternWithoutDelimiter
+, byte[] _byte
+, Integer integer
+, Integer int32
+, Long int64
+, Float _float
+, String string
+, byte[] binary
+, Date date
+, Date dateTime
+, String password
+, String paramCallback
+ ) throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
     @Override
-    public Response testEnumParameters(List<String> enumFormStringArray, String enumFormString, List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, BigDecimal enumQueryInteger, Double enumQueryDouble ) throws NotFoundException {
+    public Response testEnumParameters(List<String> enumFormStringArray
+, String enumFormString
+, List<String> enumHeaderStringArray
+, String enumHeaderString
+, List<String> enumQueryStringArray
+, String enumQueryString
+, BigDecimal enumQueryInteger
+, Double enumQueryDouble
+ ) throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
diff --git a/samples/server/petstore/java-msf4j/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java b/samples/server/petstore/java-msf4j/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java
index e99c9fa1e75..ea6b7553a52 100644
--- a/samples/server/petstore/java-msf4j/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java
+++ b/samples/server/petstore/java-msf4j/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java
@@ -12,7 +12,8 @@ import io.swagger.api.NotFoundException;
 
 import java.io.InputStream;
 
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.wso2.msf4j.formparam.FormDataParam;
+import org.wso2.msf4j.formparam.FileInfo;
 
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
@@ -20,42 +21,55 @@ import javax.ws.rs.core.SecurityContext;
 
 public class PetApiServiceImpl extends PetApiService {
     @Override
-    public Response addPet(Pet body ) throws NotFoundException {
+    public Response addPet(Pet body
+ ) throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
     @Override
-    public Response deletePet(Long petId, String apiKey ) throws NotFoundException {
+    public Response deletePet(Long petId
+, String apiKey
+ ) throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
     @Override
-    public Response findPetsByStatus(List<String> status ) throws NotFoundException {
+    public Response findPetsByStatus(List<String> status
+ ) throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
     @Override
-    public Response findPetsByTags(List<String> tags ) throws NotFoundException {
+    public Response findPetsByTags(List<String> tags
+ ) throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
     @Override
-    public Response getPetById(Long petId ) throws NotFoundException {
+    public Response getPetById(Long petId
+ ) throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
     @Override
-    public Response updatePet(Pet body ) throws NotFoundException {
+    public Response updatePet(Pet body
+ ) throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
     @Override
-    public Response updatePetWithForm(Long petId, String name, String status ) throws NotFoundException {
+    public Response updatePetWithForm(Long petId
+, String name
+, String status
+ ) throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
     @Override
-    public Response uploadFile(Long petId, String additionalMetadata, InputStream fileInputStream, FormDataContentDisposition fileDetail ) throws NotFoundException {
+    public Response uploadFile(Long petId
+, String additionalMetadata
+, InputStream fileInputStream, FileInfo fileDetail
+ ) throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
diff --git a/samples/server/petstore/java-msf4j/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java b/samples/server/petstore/java-msf4j/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java
index 9df17bebc17..cc9af6a7597 100644
--- a/samples/server/petstore/java-msf4j/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java
+++ b/samples/server/petstore/java-msf4j/src/main/java/io/swagger/api/impl/StoreApiServiceImpl.java
@@ -11,7 +11,8 @@ import io.swagger.api.NotFoundException;
 
 import java.io.InputStream;
 
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.wso2.msf4j.formparam.FormDataParam;
+import org.wso2.msf4j.formparam.FileInfo;
 
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
@@ -19,7 +20,8 @@ import javax.ws.rs.core.SecurityContext;
 
 public class StoreApiServiceImpl extends StoreApiService {
     @Override
-    public Response deleteOrder(String orderId ) throws NotFoundException {
+    public Response deleteOrder(String orderId
+ ) throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
@@ -29,12 +31,14 @@ public class StoreApiServiceImpl extends StoreApiService {
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
     @Override
-    public Response getOrderById(Long orderId ) throws NotFoundException {
+    public Response getOrderById(Long orderId
+ ) throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
     @Override
-    public Response placeOrder(Order body ) throws NotFoundException {
+    public Response placeOrder(Order body
+ ) throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
diff --git a/samples/server/petstore/java-msf4j/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java b/samples/server/petstore/java-msf4j/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java
index bab444ea620..babd595dca8 100644
--- a/samples/server/petstore/java-msf4j/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java
+++ b/samples/server/petstore/java-msf4j/src/main/java/io/swagger/api/impl/UserApiServiceImpl.java
@@ -11,7 +11,8 @@ import io.swagger.api.NotFoundException;
 
 import java.io.InputStream;
 
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.wso2.msf4j.formparam.FormDataParam;
+import org.wso2.msf4j.formparam.FileInfo;
 
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.SecurityContext;
@@ -19,32 +20,39 @@ import javax.ws.rs.core.SecurityContext;
 
 public class UserApiServiceImpl extends UserApiService {
     @Override
-    public Response createUser(User body ) throws NotFoundException {
+    public Response createUser(User body
+ ) throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
     @Override
-    public Response createUsersWithArrayInput(List<User> body ) throws NotFoundException {
+    public Response createUsersWithArrayInput(List<User> body
+ ) throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
     @Override
-    public Response createUsersWithListInput(List<User> body ) throws NotFoundException {
+    public Response createUsersWithListInput(List<User> body
+ ) throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
     @Override
-    public Response deleteUser(String username ) throws NotFoundException {
+    public Response deleteUser(String username
+ ) throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
     @Override
-    public Response getUserByName(String username ) throws NotFoundException {
+    public Response getUserByName(String username
+ ) throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
     @Override
-    public Response loginUser(String username, String password ) throws NotFoundException {
+    public Response loginUser(String username
+, String password
+ ) throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
@@ -54,7 +62,9 @@ public class UserApiServiceImpl extends UserApiService {
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
     @Override
-    public Response updateUser(String username, User body ) throws NotFoundException {
+    public Response updateUser(String username
+, User body
+ ) throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
diff --git a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Category.java b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Category.java
index c84e936b3b4..ecd7630f6a7 100644
--- a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Category.java
+++ b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Category.java
@@ -8,6 +8,7 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
 
 @XmlAccessorType(XmlAccessType.FIELD)
  @XmlType(name = "Category", propOrder =
diff --git a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/ModelApiResponse.java b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/ModelApiResponse.java
index 950307540f4..dc8a57cf13a 100644
--- a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/ModelApiResponse.java
+++ b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/ModelApiResponse.java
@@ -8,6 +8,7 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
 
 @XmlAccessorType(XmlAccessType.FIELD)
  @XmlType(name = "ModelApiResponse", propOrder =
diff --git a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Order.java b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Order.java
index d3d9ffabfb5..ec2140e1b4d 100644
--- a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Order.java
+++ b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Order.java
@@ -8,6 +8,7 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
 
 @XmlAccessorType(XmlAccessType.FIELD)
  @XmlType(name = "Order", propOrder =
@@ -31,10 +32,10 @@ public class Order  {
   private javax.xml.datatype.XMLGregorianCalendar shipDate = null;
 
 @XmlType(name="StatusEnum")
-@XmlEnum
+@XmlEnum(String.class)
 public enum StatusEnum {
 
-    PLACED(String.valueOf("placed")), APPROVED(String.valueOf("approved")), DELIVERED(String.valueOf("delivered"));
+    @XmlEnumValue("placed") PLACED(String.valueOf("placed")), @XmlEnumValue("approved") APPROVED(String.valueOf("approved")), @XmlEnumValue("delivered") DELIVERED(String.valueOf("delivered"));
 
 
     private String value;
@@ -47,8 +48,18 @@ public enum StatusEnum {
         return value;
     }
 
+    @Override
+    public String toString() {
+        return String.valueOf(value);
+    }
+
     public static StatusEnum fromValue(String v) {
-        return valueOf(v);
+        for (StatusEnum b : StatusEnum.values()) {
+            if (String.valueOf(b.value).equals(v)) {
+                return b;
+            }
+        }
+        return null;
     }
 }
 
diff --git a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Pet.java b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Pet.java
index 3c1adb7d97f..5a636e92c33 100644
--- a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Pet.java
+++ b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Pet.java
@@ -12,6 +12,7 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
 
 @XmlAccessorType(XmlAccessType.FIELD)
  @XmlType(name = "Pet", propOrder =
@@ -38,10 +39,10 @@ public class Pet  {
   private List<Tag> tags = new ArrayList<Tag>();
 
 @XmlType(name="StatusEnum")
-@XmlEnum
+@XmlEnum(String.class)
 public enum StatusEnum {
 
-    AVAILABLE(String.valueOf("available")), PENDING(String.valueOf("pending")), SOLD(String.valueOf("sold"));
+    @XmlEnumValue("available") AVAILABLE(String.valueOf("available")), @XmlEnumValue("pending") PENDING(String.valueOf("pending")), @XmlEnumValue("sold") SOLD(String.valueOf("sold"));
 
 
     private String value;
@@ -54,8 +55,18 @@ public enum StatusEnum {
         return value;
     }
 
+    @Override
+    public String toString() {
+        return String.valueOf(value);
+    }
+
     public static StatusEnum fromValue(String v) {
-        return valueOf(v);
+        for (StatusEnum b : StatusEnum.values()) {
+            if (String.valueOf(b.value).equals(v)) {
+                return b;
+            }
+        }
+        return null;
     }
 }
 
diff --git a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Tag.java b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Tag.java
index 1eddc2f761f..848da3841f0 100644
--- a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Tag.java
+++ b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/Tag.java
@@ -8,6 +8,7 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
 
 @XmlAccessorType(XmlAccessType.FIELD)
  @XmlType(name = "Tag", propOrder =
diff --git a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/User.java b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/User.java
index f66d1df57e0..e08637a5777 100644
--- a/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/User.java
+++ b/samples/server/petstore/jaxrs-cxf/gen/java/io/swagger/model/User.java
@@ -8,6 +8,7 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
 
 @XmlAccessorType(XmlAccessType.FIELD)
  @XmlType(name = "User", propOrder =