Allows for generation of spring controller code using the delegate pattern (#4439)

* Allows for generation of spring conroller code using the decorator pattern

* Change Decorator to Delegate in spring codegen

samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/FakeApi.java

@@ -1,9 +1,9 @@
 package io.swagger.api;
 
-import io.swagger.model.Client;
-import java.time.OffsetDateTime;
-import java.time.LocalDate;
 import java.math.BigDecimal;
+import io.swagger.model.Client;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
 
 import io.swagger.annotations.*;
 import org.springframework.http.HttpStatus;
@@ -24,7 +24,7 @@ import java.util.concurrent.CompletableFuture;
 @Api(value = "fake", description = "the fake API")
 public interface FakeApi {
 
-    @ApiOperation(value = "To test \"client\" model", notes = "", response = Client.class, tags={ "fake", })
+    @ApiOperation(value = "To test \"client\" model", notes = "To test \"client\" model", response = Client.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 200, message = "successful operation", response = Client.class) })
     @RequestMapping(value = "/fake",
@@ -66,7 +66,7 @@ public interface FakeApi {
     }
 
 
-    @ApiOperation(value = "To test enum parameters", notes = "", response = Void.class, tags={ "fake", })
+    @ApiOperation(value = "To test enum parameters", notes = "To test enum parameters", response = Void.class, tags={ "fake", })
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid request", response = Void.class),
         @ApiResponse(code = 404, message = "Not found", response = Void.class) })
@@ -80,7 +80,7 @@ public interface FakeApi {
         @ApiParam(value = "Header parameter enum test (string)"  , allowableValues="_ABC, _EFG, _XYZ_", defaultValue="-efg") @RequestHeader(value="enum_header_string", required=false) String enumHeaderString,
         @ApiParam(value = "Query parameter enum test (string array)", allowableValues = "GREATER_THAN, DOLLAR") @RequestParam(value = "enumQueryStringArray", required = false) List<String> enumQueryStringArray,
         @ApiParam(value = "Query parameter enum test (string)", allowableValues = "_ABC, _EFG, _XYZ_", defaultValue = "-efg") @RequestParam(value = "enumQueryString", required = false, defaultValue="-efg") String enumQueryString,
-        @ApiParam(value = "Query parameter enum test (double)") @RequestParam(value = "enumQueryInteger", required = false) BigDecimal enumQueryInteger,
+        @ApiParam(value = "Query parameter enum test (double)") @RequestParam(value = "enumQueryInteger", required = false) Integer enumQueryInteger,
         @ApiParam(value = "Query parameter enum test (double)" ) @RequestPart(value="enumQueryDouble", required=false)  Double enumQueryDouble) {
         // do some magic!
         return CompletableFuture.completedFuture(new ResponseEntity<Void>(HttpStatus.OK));

samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/FakeApiController.java

@@ -7,4 +7,6 @@ import org.springframework.stereotype.Controller;
 @Controller
 public class FakeApiController implements FakeApi {
 
+
+
 }

samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/PetApi.java

@@ -1,8 +1,8 @@
 package io.swagger.api;
 
-import io.swagger.model.Pet;
-import io.swagger.model.ModelApiResponse;
 import java.io.File;
+import io.swagger.model.ModelApiResponse;
+import io.swagger.model.Pet;
 
 import io.swagger.annotations.*;
 import org.springframework.http.HttpStatus;

samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/PetApiController.java

@@ -7,4 +7,6 @@ import org.springframework.stereotype.Controller;
 @Controller
 public class PetApiController implements PetApi {
 
+
+
 }

samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/StoreApiController.java

@@ -7,4 +7,6 @@ import org.springframework.stereotype.Controller;
 @Controller
 public class StoreApiController implements StoreApi {
 
+
+
 }

samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/UserApi.java

@@ -1,7 +1,7 @@
 package io.swagger.api;
 
-import io.swagger.model.User;
 import java.util.List;
+import io.swagger.model.User;
 
 import io.swagger.annotations.*;
 import org.springframework.http.HttpStatus;

samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/api/UserApiController.java

@@ -7,4 +7,6 @@ import org.springframework.stereotype.Controller;
 @Controller
 public class UserApiController implements UserApi {
 
+
+
 }

samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Animal.java

@@ -3,6 +3,8 @@ package io.swagger.model;
 import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/Capitalization.java

@@ -0,0 +1,189 @@
+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;
+
+/**
+ * Capitalization
+ */
+
+public class Capitalization   {
+  @JsonProperty("smallCamel")
+  private String smallCamel = null;
+
+  @JsonProperty("CapitalCamel")
+  private String capitalCamel = null;
+
+  @JsonProperty("small_Snake")
+  private String smallSnake = null;
+
+  @JsonProperty("Capital_Snake")
+  private String capitalSnake = null;
+
+  @JsonProperty("SCA_ETH_Flow_Points")
+  private String scAETHFlowPoints = null;
+
+  @JsonProperty("ATT_NAME")
+  private String ATT_NAME = null;
+
+  public Capitalization smallCamel(String smallCamel) {
+    this.smallCamel = smallCamel;
+    return this;
+  }
+
+   /**
+   * Get smallCamel
+   * @return smallCamel
+  **/
+  @ApiModelProperty(value = "")
+  public String getSmallCamel() {
+    return smallCamel;
+  }
+
+  public void setSmallCamel(String smallCamel) {
+    this.smallCamel = smallCamel;
+  }
+
+  public Capitalization capitalCamel(String capitalCamel) {
+    this.capitalCamel = capitalCamel;
+    return this;
+  }
+
+   /**
+   * Get capitalCamel
+   * @return capitalCamel
+  **/
+  @ApiModelProperty(value = "")
+  public String getCapitalCamel() {
+    return capitalCamel;
+  }
+
+  public void setCapitalCamel(String capitalCamel) {
+    this.capitalCamel = capitalCamel;
+  }
+
+  public Capitalization smallSnake(String smallSnake) {
+    this.smallSnake = smallSnake;
+    return this;
+  }
+
+   /**
+   * Get smallSnake
+   * @return smallSnake
+  **/
+  @ApiModelProperty(value = "")
+  public String getSmallSnake() {
+    return smallSnake;
+  }
+
+  public void setSmallSnake(String smallSnake) {
+    this.smallSnake = smallSnake;
+  }
+
+  public Capitalization capitalSnake(String capitalSnake) {
+    this.capitalSnake = capitalSnake;
+    return this;
+  }
+
+   /**
+   * Get capitalSnake
+   * @return capitalSnake
+  **/
+  @ApiModelProperty(value = "")
+  public String getCapitalSnake() {
+    return capitalSnake;
+  }
+
+  public void setCapitalSnake(String capitalSnake) {
+    this.capitalSnake = capitalSnake;
+  }
+
+  public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
+    this.scAETHFlowPoints = scAETHFlowPoints;
+    return this;
+  }
+
+   /**
+   * Get scAETHFlowPoints
+   * @return scAETHFlowPoints
+  **/
+  @ApiModelProperty(value = "")
+  public String getScAETHFlowPoints() {
+    return scAETHFlowPoints;
+  }
+
+  public void setScAETHFlowPoints(String scAETHFlowPoints) {
+    this.scAETHFlowPoints = scAETHFlowPoints;
+  }
+
+  public Capitalization ATT_NAME(String ATT_NAME) {
+    this.ATT_NAME = ATT_NAME;
+    return this;
+  }
+
+   /**
+   * Name of the pet 
+   * @return ATT_NAME
+  **/
+  @ApiModelProperty(value = "Name of the pet ")
+  public String getATTNAME() {
+    return ATT_NAME;
+  }
+
+  public void setATTNAME(String ATT_NAME) {
+    this.ATT_NAME = ATT_NAME;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Capitalization capitalization = (Capitalization) o;
+    return Objects.equals(this.smallCamel, capitalization.smallCamel) &&
+        Objects.equals(this.capitalCamel, capitalization.capitalCamel) &&
+        Objects.equals(this.smallSnake, capitalization.smallSnake) &&
+        Objects.equals(this.capitalSnake, capitalization.capitalSnake) &&
+        Objects.equals(this.scAETHFlowPoints, capitalization.scAETHFlowPoints) &&
+        Objects.equals(this.ATT_NAME, capitalization.ATT_NAME);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(smallCamel, capitalCamel, smallSnake, capitalSnake, scAETHFlowPoints, ATT_NAME);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Capitalization {\n");
+    
+    sb.append("    smallCamel: ").append(toIndentedString(smallCamel)).append("\n");
+    sb.append("    capitalCamel: ").append(toIndentedString(capitalCamel)).append("\n");
+    sb.append("    smallSnake: ").append(toIndentedString(smallSnake)).append("\n");
+    sb.append("    capitalSnake: ").append(toIndentedString(capitalSnake)).append("\n");
+    sb.append("    scAETHFlowPoints: ").append(toIndentedString(scAETHFlowPoints)).append("\n");
+    sb.append("    ATT_NAME: ").append(toIndentedString(ATT_NAME)).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    ");
+  }
+}
+

samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/ClassModel.java

@@ -0,0 +1,75 @@
+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;
+
+/**
+ * Model for testing model with \"_class\" property
+ */
+@ApiModel(description = "Model for testing model with \"_class\" property")
+
+public class ClassModel   {
+  @JsonProperty("_class")
+  private String propertyClass = null;
+
+  public ClassModel propertyClass(String propertyClass) {
+    this.propertyClass = propertyClass;
+    return this;
+  }
+
+   /**
+   * Get propertyClass
+   * @return propertyClass
+  **/
+  @ApiModelProperty(value = "")
+  public String getPropertyClass() {
+    return propertyClass;
+  }
+
+  public void setPropertyClass(String propertyClass) {
+    this.propertyClass = propertyClass;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ClassModel classModel = (ClassModel) o;
+    return Objects.equals(this.propertyClass, classModel.propertyClass);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(propertyClass);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ClassModel {\n");
+    
+    sb.append("    propertyClass: ").append(toIndentedString(propertyClass)).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    ");
+  }
+}
+

samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/EnumTest.java

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import io.swagger.model.OuterEnum;
 
 /**
  * EnumTest
@@ -116,6 +117,9 @@ public class EnumTest   {
   @JsonProperty("enum_number")
   private EnumNumberEnum enumNumber = null;
 
+  @JsonProperty("outerEnum")
+  private OuterEnum outerEnum = null;
+
   public EnumTest enumString(EnumStringEnum enumString) {
     this.enumString = enumString;
     return this;
@@ -170,6 +174,24 @@ public class EnumTest   {
     this.enumNumber = enumNumber;
   }
 
+  public EnumTest outerEnum(OuterEnum outerEnum) {
+    this.outerEnum = outerEnum;
+    return this;
+  }
+
+   /**
+   * Get outerEnum
+   * @return outerEnum
+  **/
+  @ApiModelProperty(value = "")
+  public OuterEnum getOuterEnum() {
+    return outerEnum;
+  }
+
+  public void setOuterEnum(OuterEnum outerEnum) {
+    this.outerEnum = outerEnum;
+  }
+
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -182,12 +204,13 @@ public class EnumTest   {
     EnumTest enumTest = (EnumTest) o;
     return Objects.equals(this.enumString, enumTest.enumString) &&
         Objects.equals(this.enumInteger, enumTest.enumInteger) &&
-        Objects.equals(this.enumNumber, enumTest.enumNumber);
+        Objects.equals(this.enumNumber, enumTest.enumNumber) &&
+        Objects.equals(this.outerEnum, enumTest.outerEnum);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(enumString, enumInteger, enumNumber);
+    return Objects.hash(enumString, enumInteger, enumNumber, outerEnum);
   }
 
   @Override
@@ -198,6 +221,7 @@ public class EnumTest   {
     sb.append("    enumString: ").append(toIndentedString(enumString)).append("\n");
     sb.append("    enumInteger: ").append(toIndentedString(enumInteger)).append("\n");
     sb.append("    enumNumber: ").append(toIndentedString(enumNumber)).append("\n");
+    sb.append("    outerEnum: ").append(toIndentedString(outerEnum)).append("\n");
     sb.append("}");
     return sb.toString();
   }

samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/FormatTest.java

@@ -60,8 +60,8 @@ public class FormatTest   {
 
    /**
    * Get integer
-   * minimum: 10.0
-   * maximum: 100.0
+   * minimum: 10
+   * maximum: 100
    * @return integer
   **/
   @ApiModelProperty(value = "")
@@ -80,8 +80,8 @@ public class FormatTest   {
 
    /**
    * Get int32
-   * minimum: 20.0
-   * maximum: 200.0
+   * minimum: 20
+   * maximum: 200
    * @return int32
   **/
   @ApiModelProperty(value = "")

samples/server/petstore/spring-mvc-j8-async/src/main/java/io/swagger/model/OuterEnum.java

@@ -0,0 +1,41 @@
+package io.swagger.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+
+/**
+ * Gets or Sets OuterEnum
+ */
+public enum OuterEnum {
+  
+  PLACED("placed"),
+  
+  APPROVED("approved"),
+  
+  DELIVERED("delivered");
+
+  private String value;
+
+  OuterEnum(String value) {
+    this.value = value;
+  }
+
+  @Override
+  @JsonValue
+  public String toString() {
+    return String.valueOf(value);
+  }
+
+  @JsonCreator
+  public static OuterEnum fromValue(String text) {
+    for (OuterEnum b : OuterEnum.values()) {
+      if (String.valueOf(b.value).equals(text)) {
+        return b;
+      }
+    }
+    return null;
+  }
+}
+