updated java and javascrip sample

Author: HugoMario

modules/swagger-codegen/src/main/resources/Java/pojo.mustache

@@ -3,9 +3,9 @@
  */{{#description}}
 @ApiModel(description = "{{{description}}}"){{/description}}
 {{>generatedAnnotation}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}{{>xmlAnnotation}}
-
-{{#notNullJacksonAnnotation}}@JsonInclude(JsonInclude.Include.NON_NULL){{/notNullJacksonAnnotation}}
-
+{{#notNullJacksonAnnotation}}
+@JsonInclude(JsonInclude.Include.NON_NULL)
+{{/notNullJacksonAnnotation}}
 public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#parcelableModel}}implements Parcelable {{#serializableModel}}, Serializable {{/serializableModel}}{{/parcelableModel}}{{^parcelableModel}}{{#serializableModel}}implements Serializable {{/serializableModel}}{{/parcelableModel}}{
 {{#serializableModel}}
   private static final long serialVersionUID = 1L;

modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml

@@ -1466,6 +1466,32 @@ definitions:
     type: string
   OuterBoolean:
     type: boolean
+  Boolean:
+    type: boolean
+    description: True or False indicator
+    enum:
+      - true
+      - false
+  Ints:
+    type: integer
+    format: int32
+    description: True or False indicator
+    enum:
+      - 0
+      - 1
+      - 2
+      - 3
+      - 4
+      - 5
+      - 6
+  Numbers:
+    type: number
+    description: some number
+    enum:
+      - 7
+      - 8
+      - 9
+      - 10
 externalDocs:
   description: Find out more about Swagger
   url: 'http://swagger.io'

samples/client/petstore/java/feign/.swagger-codegen/VERSION

@@ -1 +1 @@
-2.4.8-SNAPSHOT
+2.4.18-SNAPSHOT

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Ints.java

@@ -0,0 +1,68 @@
+/*
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: [email protected]
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package io.swagger.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import io.swagger.annotations.ApiModel;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * True or False indicator
+ */
+public enum Ints {
+  
+  NUMBER_0(0),
+  
+  NUMBER_1(1),
+  
+  NUMBER_2(2),
+  
+  NUMBER_3(3),
+  
+  NUMBER_4(4),
+  
+  NUMBER_5(5),
+  
+  NUMBER_6(6);
+
+  private Integer value;
+
+  Ints(Integer value) {
+    this.value = value;
+  }
+
+  @JsonValue
+  public Integer getValue() {
+    return value;
+  }
+
+  @Override
+  public String toString() {
+    return String.valueOf(value);
+  }
+
+  @JsonCreator
+  public static Ints fromValue(String text) {
+    for (Ints b : Ints.values()) {
+      if (String.valueOf(b.value).equals(text)) {
+        return b;
+      }
+    }
+    return null;
+  }
+}
+

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelBoolean.java

@@ -0,0 +1,58 @@
+/*
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: [email protected]
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package io.swagger.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import io.swagger.annotations.ApiModel;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * True or False indicator
+ */
+public enum ModelBoolean {
+  
+  TRUE(true),
+  
+  FALSE(false);
+
+  private Boolean value;
+
+  ModelBoolean(Boolean value) {
+    this.value = value;
+  }
+
+  @JsonValue
+  public Boolean getValue() {
+    return value;
+  }
+
+  @Override
+  public String toString() {
+    return String.valueOf(value);
+  }
+
+  @JsonCreator
+  public static ModelBoolean fromValue(String text) {
+    for (ModelBoolean b : ModelBoolean.values()) {
+      if (String.valueOf(b.value).equals(text)) {
+        return b;
+      }
+    }
+    return null;
+  }
+}
+

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelList.java

@@ -0,0 +1,91 @@
+/*
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: [email protected]
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package io.swagger.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * ModelList
+ */
+
+public class ModelList {
+  @JsonProperty("123-list")
+  private String _123List = null;
+
+  public ModelList _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;
+    }
+    ModelList _list = (ModelList) 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 ModelList {\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    ");
+  }
+
+}
+

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Numbers.java

@@ -0,0 +1,63 @@
+/*
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: [email protected]
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+
+package io.swagger.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import io.swagger.annotations.ApiModel;
+import java.math.BigDecimal;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * some number
+ */
+public enum Numbers {
+  
+  NUMBER_7(new BigDecimal(7)),
+  
+  NUMBER_8(new BigDecimal(8)),
+  
+  NUMBER_9(new BigDecimal(9)),
+  
+  NUMBER_10(new BigDecimal(10));
+
+  private BigDecimal value;
+
+  Numbers(BigDecimal value) {
+    this.value = value;
+  }
+
+  @JsonValue
+  public BigDecimal getValue() {
+    return value;
+  }
+
+  @Override
+  public String toString() {
+    return String.valueOf(value);
+  }
+
+  @JsonCreator
+  public static Numbers fromValue(String text) {
+    for (Numbers b : Numbers.values()) {
+      if (String.valueOf(b.value).equals(text)) {
+        return b;
+      }
+    }
+    return null;
+  }
+}
+

samples/client/petstore/java/jersey1/.swagger-codegen/VERSION

@@ -1 +1 @@
-2.4.3-SNAPSHOT
+2.4.18-SNAPSHOT

samples/client/petstore/java/jersey1/docs/Ints.md

@@ -0,0 +1,22 @@
+
+# Ints
+
+## Enum
+
+
+* `NUMBER_0` (value: `0`)
+
+* `NUMBER_1` (value: `1`)
+
+* `NUMBER_2` (value: `2`)
+
+* `NUMBER_3` (value: `3`)
+
+* `NUMBER_4` (value: `4`)
+
+* `NUMBER_5` (value: `5`)
+
+* `NUMBER_6` (value: `6`)
+
+
+

samples/client/petstore/java/jersey1/docs/ModelBoolean.md

@@ -0,0 +1,12 @@
+
+# ModelBoolean
+
+## Enum
+
+
+* `TRUE` (value: `true`)
+
+* `FALSE` (value: `false`)
+
+
+