Merge pull request #10201 from swagger-api/issues-10185

Issues 10185

Author: HugoMario

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

@@ -101,7 +101,7 @@ public interface {{classname}} {
         produces = { {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }, {{/hasProduces}}{{#hasConsumes}}
         consumes = { {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} },{{/hasConsumes}}{{/singleContentTypes}}
         method = RequestMethod.{{httpMethod}})
-    {{#defaultInterfaces}}default {{/defaultInterfaces}}{{#responseWrapper}}{{.}}<{{/responseWrapper}}ResponseEntity<{{>returnTypes}}>{{#responseWrapper}}>{{/responseWrapper}} {{#delegate-method}}_{{/delegate-method}}{{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},{{/hasMore}}{{/allParams}}){{^defaultInterfaces}};{{/defaultInterfaces}}{{#defaultInterfaces}} {
+    {{#jdk8}}{{#defaultInterfaces}}default {{/defaultInterfaces}}{{/jdk8}}{{#responseWrapper}}{{.}}<{{/responseWrapper}}ResponseEntity<{{>returnTypes}}>{{#responseWrapper}}>{{/responseWrapper}} {{#delegate-method}}_{{/delegate-method}}{{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},{{/hasMore}}{{/allParams}}){{^jdk8}};{{/jdk8}}{{#jdk8}}{{#defaultInterfaces}} {
         {{#delegate-method}}
         return {{operationId}}({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
     }
@@ -129,7 +129,7 @@ public interface {{classname}} {
         {{#isDelegate}}
         return getDelegate().{{operationId}}({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
         {{/isDelegate}}
-    }{{/defaultInterfaces}}
+    }{{/defaultInterfaces}}{{/jdk8}}
 
 {{/operation}}
 }

samples/server/petstore/springboot/.swagger-codegen/VERSION

@@ -1 +1 @@
-2.4.10-SNAPSHOT
+2.4.14-SNAPSHOT

samples/server/petstore/springboot/src/main/java/io/swagger/api/AnotherFakeApi.java

@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.4.10-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.4.14-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */

samples/server/petstore/springboot/src/main/java/io/swagger/api/FakeApi.java

@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.4.10-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.4.14-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */

samples/server/petstore/springboot/src/main/java/io/swagger/api/FakeClassnameTestApi.java

@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.4.10-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.4.14-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */

samples/server/petstore/springboot/src/main/java/io/swagger/api/PetApi.java

@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.4.10-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.4.14-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */
@@ -144,6 +144,6 @@ public interface PetApi {
         produces = { "application/json" }, 
         consumes = { "multipart/form-data" },
         method = RequestMethod.POST)
-    ResponseEntity<ModelApiResponse> uploadFile(@ApiParam(value = "ID of pet to update",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "Additional data to pass to server") @RequestParam(value="additionalMetadata", required=false)  String additionalMetadata,@ApiParam(value = "file detail") @Valid @RequestPart("file") MultipartFile file);
+    ResponseEntity<ModelApiResponse> uploadFile(@ApiParam(value = "ID of pet to update",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "Additional data to pass to server") @RequestParam(value="additionalMetadata", required=false)  String additionalMetadata,@ApiParam(value = "file to upload") @Valid @RequestPart(value="file", required=false) MultipartFile file);
 
 }

samples/server/petstore/springboot/src/main/java/io/swagger/api/PetApiController.java

@@ -127,7 +127,7 @@ public ResponseEntity<Void> updatePetWithForm(@ApiParam(value = "ID of pet that
         return new ResponseEntity<Void>(HttpStatus.NOT_IMPLEMENTED);
     }
 
-    public ResponseEntity<ModelApiResponse> uploadFile(@ApiParam(value = "ID of pet to update",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "Additional data to pass to server") @RequestParam(value="additionalMetadata", required=false)  String additionalMetadata,@ApiParam(value = "file detail") @Valid @RequestPart("file") MultipartFile file) {
+    public ResponseEntity<ModelApiResponse> uploadFile(@ApiParam(value = "ID of pet to update",required=true) @PathVariable("petId") Long petId,@ApiParam(value = "Additional data to pass to server") @RequestParam(value="additionalMetadata", required=false)  String additionalMetadata,@ApiParam(value = "file to upload") @Valid @RequestPart(value="file", required=false) MultipartFile file) {
         String accept = request.getHeader("Accept");
         if (accept != null && accept.contains("application/json")) {
             try {

samples/server/petstore/springboot/src/main/java/io/swagger/api/StoreApi.java

@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.4.10-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.4.14-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */

samples/server/petstore/springboot/src/main/java/io/swagger/api/UserApi.java

@@ -1,5 +1,5 @@
 /**
- * NOTE: This class is auto generated by the swagger code generator program (2.4.10-SNAPSHOT).
+ * NOTE: This class is auto generated by the swagger code generator program (2.4.14-SNAPSHOT).
  * https://github.com/swagger-api/swagger-codegen
  * Do not edit the class manually.
  */

samples/server/petstore/springboot/src/main/java/io/swagger/model/List.java

@@ -0,0 +1,80 @@
+package io.swagger.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.validation.annotation.Validated;
+import javax.validation.Valid;
+import javax.validation.constraints.*;
+
+/**
+ * List
+ */
+@Validated
+
+public class List   {
+  @JsonProperty("123-list")
+  private String _123List = null;
+
+  public List _123List(String _123List) {
+    this._123List = _123List;
+    return this;
+  }
+
+  /**
+   * Get _123List
+   * @return _123List
+  **/
+  @ApiModelProperty(value = "")
+
+
+  public String get123List() {
+    return _123List;
+  }
+
+  public void set123List(String _123List) {
+    this._123List = _123List;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    List list = (List) o;
+    return Objects.equals(this._123List, list._123List);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(_123List);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class List {\n");
+    
+    sb.append("    _123List: ").append(toIndentedString(_123List)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+