From 1520ec536e1d0b7abd1927b20e9d120a807acf2f Mon Sep 17 00:00:00 2001
From: Tony Tam <fehguy@gmail.com>
Date: Tue, 1 Sep 2015 23:34:29 -0700
Subject: [PATCH] formatting, vendor extensions on operations

---
 .../io/swagger/codegen/CodegenOperation.java  |  1 +
 .../io/swagger/codegen/CodegenParameter.java  |  1 -
 .../io/swagger/codegen/DefaultCodegen.java    | 45 ++++++++++---------
 3 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java
index 4f30cc01ccb..3bc1744446a 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java
@@ -29,6 +29,7 @@ public class CodegenOperation {
     public Set<String> imports = new HashSet<String>();
     public List<Map<String, String>> examples;
     public ExternalDocs externalDocs;
+    public Map<String, Object> vendorExtensions;
 
     private boolean nonempty(List<CodegenParameter> params)
     {
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenParameter.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenParameter.java
index e9383f48c6b..6dd85d10c27 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenParameter.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenParameter.java
@@ -15,7 +15,6 @@ public class CodegenParameter {
     public Map<String, Object> allowableValues;
     public Map<String, Object> vendorExtensions;
 
-
     /**
      * Determines whether this parameter is mandatory. If the parameter is in "path",
      * this property is required and its value MUST be true. Otherwise, the property
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 99db99bd962..f4198d11c40 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
@@ -781,28 +781,28 @@ public class DefaultCodegen {
 
         property.baseType = getSwaggerType(p);
 
-	if (p instanceof ArrayProperty) {
-		property.isContainer = true;
-		property.containerType = "array";
-		ArrayProperty ap = (ArrayProperty) p;
-		CodegenProperty cp = fromProperty(property.name, ap.getItems());
-		if (cp == null) {
-			LOGGER.warn("skipping invalid property " + Json.pretty(p));
-		} else {
-			property.baseType = getSwaggerType(p);
-			if (!languageSpecificPrimitives.contains(cp.baseType)) {
-				property.complexType = cp.baseType;
-			} else {
-				property.isPrimitiveType = true;
-			}
-			property.items = cp;
-			if (property.items.isEnum) {
-				property.datatypeWithEnum = property.datatypeWithEnum.replace(property.items.baseType,
-						property.items.datatypeWithEnum);
-				property.defaultValue = property.defaultValue.replace(property.items.baseType, property.items.datatypeWithEnum);
-			}
-		}
-	} else if (p instanceof MapProperty) {
+      	if (p instanceof ArrayProperty) {
+        		property.isContainer = true;
+        		property.containerType = "array";
+        		ArrayProperty ap = (ArrayProperty) p;
+        		CodegenProperty cp = fromProperty(property.name, ap.getItems());
+        		if (cp == null) {
+        			 LOGGER.warn("skipping invalid property " + Json.pretty(p));
+        		} else {
+          			property.baseType = getSwaggerType(p);
+          			if (!languageSpecificPrimitives.contains(cp.baseType)) {
+          				  property.complexType = cp.baseType;
+          			} else {
+          				  property.isPrimitiveType = true;
+          			}
+          			property.items = cp;
+          			if (property.items.isEnum) {
+          				  property.datatypeWithEnum = property.datatypeWithEnum.replace(property.items.baseType,
+          						property.items.datatypeWithEnum);
+          				  property.defaultValue = property.defaultValue.replace(property.items.baseType, property.items.datatypeWithEnum);
+          			}
+        		}
+      	} else if (p instanceof MapProperty) {
             property.isContainer = true;
             property.containerType = "map";
             MapProperty ap = (MapProperty) p;
@@ -848,6 +848,7 @@ public class DefaultCodegen {
     public CodegenOperation fromOperation(String path, String httpMethod, Operation operation, Map<String, Model> definitions) {
         CodegenOperation op = CodegenModelFactory.newInstance(CodegenModelType.OPERATION);
         Set<String> imports = new HashSet<String>();
+        op.vendorExtensions = operation.getVendorExtensions();
 
         String operationId = operation.getOperationId();
         if (operationId == null) {