Merge branch 'sdavis-r7-master'

Author: wing328

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

@@ -722,6 +722,15 @@ public String toEnumValue(String value, String datatype) {
         }
     }
 
+    @Override
+    public CodegenOperation fromOperation(String path, String httpMethod, Operation operation, Map<String, Model> definitions, Swagger swagger) {
+        CodegenOperation op = super.fromOperation(path, httpMethod, operation, definitions, swagger);
+
+        op.path = sanitizePath(op.path);
+        
+        return op;
+    }
+    
     private static CodegenModel reconcileInlineEnums(CodegenModel codegenModel, CodegenModel parentCodegenModel) {
         // This generator uses inline classes to define enums, which breaks when
         // dealing with models that have subTypes. To clean this up, we will analyze
@@ -811,6 +820,11 @@ public void setSerializableModel(Boolean serializableModel) {
         this.serializableModel = serializableModel;
     }
 
+    private String sanitizePath(String p) {
+        //prefer replace a ", instead of a fuLL URL encode for readability
+        return p.replaceAll("\"", "%22");
+    }
+
     public void setFullJavaUtil(boolean fullJavaUtil) {
         this.fullJavaUtil = fullJavaUtil;
     }

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

@@ -684,6 +684,9 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation
         op.returnType = normalizeType(op.returnType);
       }
 
+      //path is an unescaped variable in the mustache template api.mustache line 82 '<&path>'    
+      op.path = sanitizePath(op.path);
+
       // Set vendor-extension to be used in template:
       //     x-codegen-hasMoreRequired
       //     x-codegen-hasMoreOptional
@@ -738,6 +741,11 @@ public CodegenModel fromModel(String name, Model model, Map<String, Model> allDe
         return codegenModel;
     }
 
+    private String sanitizePath(String p) {
+        //prefer replace a ', instead of a fuLL URL encode for readability
+        return p.replaceAll("'", "%27");
+    }
+    
     private String trimBrackets(String s) {
         if (s != null) {
             int beginIdx = s.charAt(0) == '[' ? 1 : 0;

modules/swagger-codegen/src/main/resources/php/api.mustache

@@ -86,9 +86,10 @@ use \{{invokerPackage}}\ObjectSerializer;
      * Operation {{{operationId}}}
      *
      * {{{summary}}}.
-     *
-  {{#allParams}}   * @param {{dataType}} ${{paramName}} {{description}} {{#required}}(required){{/required}}{{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}
-  {{/allParams}}   *
+     */
+  {{#allParams}} //  * @param {{dataType}} ${{paramName}} {{description}} {{#required}}(required){{/required}}{{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}
+  {{/allParams}}   
+    /**
      * @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
      * @throws \{{invokerPackage}}\ApiException on non-2xx response
      */
@@ -103,9 +104,10 @@ use \{{invokerPackage}}\ObjectSerializer;
      * Operation {{{operationId}}}WithHttpInfo
      *
      * {{{summary}}}.
-     *
-  {{#allParams}}   * @param {{dataType}} ${{paramName}} {{description}} {{#required}}(required){{/required}}{{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}
-  {{/allParams}}   *
+     */
+  {{#allParams}} //  * @param {{dataType}} ${{paramName}} {{description}} {{#required}}(required){{/required}}{{^required}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/required}}
+  {{/allParams}}   
+    /**
      * @return Array of {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}null{{/returnType}}, HTTP status code, HTTP response headers (array of strings)
      * @throws \{{invokerPackage}}\ApiException on non-2xx response
      */

modules/swagger-codegen/src/main/resources/php/model.mustache

@@ -29,10 +29,11 @@ use \ArrayAccess;
 /**
  * {{classname}} Class Doc Comment
  *
- * @category    Class
+ * @category    Class */
 {{#description}}
- * @description {{description}}
+ // @description {{description}}
 {{/description}}
+/** 
  * @package     {{invokerPackage}}
  * @author      http://github.com/swagger-api/swagger-codegen
  * @license     http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2

modules/swagger-codegen/src/main/resources/php/model_test.mustache

@@ -25,8 +25,9 @@ namespace {{invokerPackage}};
 /**
  * {{classname}}Test Class Doc Comment
  *
- * @category    Class
- * @description {{#description}}{{description}}{{/description}}{{^description}}{{classname}}{{/description}}
+ * @category    Class */
+// * @description {{#description}}{{description}}{{/description}}{{^description}}{{classname}}{{/description}}
+/**
  * @package     {{invokerPackage}}
  * @author      http://github.com/swagger-api/swagger-codegen
  * @license     http://www.apache.org/licenses/LICENSE-2.0 Apache Licene v2

modules/swagger-codegen/src/main/resources/php/partial_header.mustache

@@ -2,12 +2,11 @@
  {{#appName}}
  * {{{appName}}}
  *
- {{/appName}}
+ {{/appName}} */
  {{#appDescription}}
- * {{{appDescription}}}
- *
+//* {{{appDescription}}}
  {{/appDescription}}
- * {{#version}}OpenAPI spec version: {{{version}}}{{/version}}
+/* {{#version}}OpenAPI spec version: {{{version}}}{{/version}}
  * {{#infoEmail}}Contact: {{{infoEmail}}}{{/infoEmail}}
  * Generated by: https://github.com/swagger-api/swagger-codegen.git
  *

modules/swagger-codegen/src/main/resources/ruby/api_info.mustache

@@ -1,9 +1,9 @@
 {{#appName}}
-{{{appName}}}
+#{{{appName}}}
 
 {{/appName}}
 {{#appDescription}}
-{{{appDescription}}}
+#{{{appDescription}}}
 
 {{/appDescription}}
 {{#version}}OpenAPI spec version: {{version}}{{/version}}