Merge remote-tracking branch 'origin/master' into 2.3.0

modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenOperation.java

@@ -38,6 +38,7 @@ public class CodegenOperation {
     public String nickname; // legacy support
     public String operationIdLowerCase; // for markdown documentation
     public String operationIdCamelCase; // for class names
+    public String operationIdSnakeCase;
 
     /**
      * Check if there's at least one parameter

modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java

@@ -2887,6 +2887,7 @@ public class DefaultCodegen {
         co.operationId = uniqueName;
         co.operationIdLowerCase = uniqueName.toLowerCase();
         co.operationIdCamelCase = DefaultCodegen.camelize(uniqueName);
+        co.operationIdSnakeCase = DefaultCodegen.underscore(uniqueName);
         opList.add(co);
         co.baseName = tag;
     }

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/StaticHtml2Generator.java

@@ -190,6 +190,8 @@ public class StaticHtml2Generator extends DefaultCodegen implements CodegenConfi
         }
         op.vendorExtensions.put("x-codegen-hasRequiredParams", lastRequired != null);
 
+        op.vendorExtensions.put("x-codegen-httpMethodUpperCase", httpMethod.toUpperCase());
+
         return op;
     }