Merge remote-tracking branch 'origin/3.1.x' into 4.0.x

# Conflicts:
#	samples/server/petstore/kotlin-server/ktor/.openapi-generator/VERSION
#	samples/server/petstore/kotlin-server/ktor/README.md
#	samples/server/petstore/php-silex/.openapi-generator/VERSION

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MapTest.java

@@ -23,6 +23,7 @@ import io.swagger.annotations.ApiModelProperty;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.openapitools.client.model.StringBooleanMap;
 
 /**
  * MapTest
@@ -70,6 +71,12 @@ public class MapTest {
   @JsonProperty("map_of_enum_string")
   private Map<String, InnerEnum> mapOfEnumString = null;
 
+  @JsonProperty("direct_map")
+  private Map<String, Boolean> directMap = null;
+
+  @JsonProperty("indirect_map")
+  private StringBooleanMap indirectMap = null;
+
   public MapTest mapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
     this.mapMapOfString = mapMapOfString;
     return this;
@@ -122,6 +129,50 @@ public class MapTest {
     this.mapOfEnumString = mapOfEnumString;
   }
 
+  public MapTest directMap(Map<String, Boolean> directMap) {
+    this.directMap = directMap;
+    return this;
+  }
+
+  public MapTest putDirectMapItem(String key, Boolean directMapItem) {
+    if (this.directMap == null) {
+      this.directMap = new HashMap<String, Boolean>();
+    }
+    this.directMap.put(key, directMapItem);
+    return this;
+  }
+
+   /**
+   * Get directMap
+   * @return directMap
+  **/
+  @ApiModelProperty(value = "")
+  public Map<String, Boolean> getDirectMap() {
+    return directMap;
+  }
+
+  public void setDirectMap(Map<String, Boolean> directMap) {
+    this.directMap = directMap;
+  }
+
+  public MapTest indirectMap(StringBooleanMap indirectMap) {
+    this.indirectMap = indirectMap;
+    return this;
+  }
+
+   /**
+   * Get indirectMap
+   * @return indirectMap
+  **/
+  @ApiModelProperty(value = "")
+  public StringBooleanMap getIndirectMap() {
+    return indirectMap;
+  }
+
+  public void setIndirectMap(StringBooleanMap indirectMap) {
+    this.indirectMap = indirectMap;
+  }
+
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -133,12 +184,14 @@ public class MapTest {
     }
     MapTest mapTest = (MapTest) o;
     return Objects.equals(this.mapMapOfString, mapTest.mapMapOfString) &&
-        Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString);
+        Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString) &&
+        Objects.equals(this.directMap, mapTest.directMap) &&
+        Objects.equals(this.indirectMap, mapTest.indirectMap);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(mapMapOfString, mapOfEnumString);
+    return Objects.hash(mapMapOfString, mapOfEnumString, directMap, indirectMap);
   }
 
 
@@ -149,6 +202,8 @@ public class MapTest {
     
     sb.append("    mapMapOfString: ").append(toIndentedString(mapMapOfString)).append("\n");
     sb.append("    mapOfEnumString: ").append(toIndentedString(mapOfEnumString)).append("\n");
+    sb.append("    directMap: ").append(toIndentedString(directMap)).append("\n");
+    sb.append("    indirectMap: ").append(toIndentedString(indirectMap)).append("\n");
     sb.append("}");
     return sb.toString();
   }

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterComposite.java

@@ -82,7 +82,7 @@ public class OuterComposite {
    * @return myBoolean
   **/
   @ApiModelProperty(value = "")
-  public Boolean getMyBoolean() {
+  public Boolean isMyBoolean() {
     return myBoolean;
   }
 

samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/StringBooleanMap.java

@@ -0,0 +1,65 @@
+/*
+ * OpenAPI 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
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * StringBooleanMap
+ */
+
+public class StringBooleanMap extends HashMap<String, Boolean> {
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    return super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class StringBooleanMap {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).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/test/java/org/openapitools/client/StringUtilTest.java

@@ -0,0 +1,33 @@
+package org.openapitools.client;
+
+import org.junit.*;
+import static org.junit.Assert.*;
+
+
+public class StringUtilTest {
+    @Test
+    public void testContainsIgnoreCase() {
+        assertTrue(StringUtil.containsIgnoreCase(new String[]{"abc"}, "abc"));
+        assertTrue(StringUtil.containsIgnoreCase(new String[]{"abc"}, "ABC"));
+        assertTrue(StringUtil.containsIgnoreCase(new String[]{"ABC"}, "abc"));
+        assertTrue(StringUtil.containsIgnoreCase(new String[]{null, "abc"}, "ABC"));
+        assertTrue(StringUtil.containsIgnoreCase(new String[]{null, "abc"}, null));
+
+        assertFalse(StringUtil.containsIgnoreCase(new String[]{"abc"}, "def"));
+        assertFalse(StringUtil.containsIgnoreCase(new String[]{}, "ABC"));
+        assertFalse(StringUtil.containsIgnoreCase(new String[]{}, null));
+    }
+
+    @Test
+    public void testJoin() {
+        String[] array = {"aa", "bb", "cc"};
+        assertEquals("aa,bb,cc", StringUtil.join(array, ","));
+        assertEquals("aa, bb, cc", StringUtil.join(array, ", "));
+        assertEquals("aabbcc", StringUtil.join(array, ""));
+        assertEquals("aa bb cc", StringUtil.join(array, " "));
+        assertEquals("aa\nbb\ncc", StringUtil.join(array, "\n"));
+
+        assertEquals("", StringUtil.join(new String[]{}, ","));
+        assertEquals("abc", StringUtil.join(new String[]{"abc"}, ","));
+    }
+}

samples/client/petstore/java/google-api-client/docs/MapTest.md

@@ -6,6 +6,8 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **mapMapOfString** | [**Map<String, Map<String, String>>**](Map.md) |  |  [optional]
 **mapOfEnumString** | [**Map<String, InnerEnum>**](#Map<String, InnerEnum>) |  |  [optional]
+**directMap** | **Map<String, Boolean>** |  |  [optional]
+**indirectMap** | [**StringBooleanMap**](StringBooleanMap.md) |  |  [optional]
 
 
 <a name="Map<String, InnerEnum>"></a>

samples/client/petstore/java/google-api-client/docs/StringBooleanMap.md

@@ -0,0 +1,9 @@
+
+# StringBooleanMap
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+
+

samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MapTest.java

@@ -23,6 +23,7 @@ import io.swagger.annotations.ApiModelProperty;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.openapitools.client.model.StringBooleanMap;
 
 /**
  * MapTest
@@ -70,6 +71,12 @@ public class MapTest {
   @JsonProperty("map_of_enum_string")
   private Map<String, InnerEnum> mapOfEnumString = null;
 
+  @JsonProperty("direct_map")
+  private Map<String, Boolean> directMap = null;
+
+  @JsonProperty("indirect_map")
+  private StringBooleanMap indirectMap = null;
+
   public MapTest mapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
     this.mapMapOfString = mapMapOfString;
     return this;
@@ -122,6 +129,50 @@ public class MapTest {
     this.mapOfEnumString = mapOfEnumString;
   }
 
+  public MapTest directMap(Map<String, Boolean> directMap) {
+    this.directMap = directMap;
+    return this;
+  }
+
+  public MapTest putDirectMapItem(String key, Boolean directMapItem) {
+    if (this.directMap == null) {
+      this.directMap = new HashMap<String, Boolean>();
+    }
+    this.directMap.put(key, directMapItem);
+    return this;
+  }
+
+   /**
+   * Get directMap
+   * @return directMap
+  **/
+  @ApiModelProperty(value = "")
+  public Map<String, Boolean> getDirectMap() {
+    return directMap;
+  }
+
+  public void setDirectMap(Map<String, Boolean> directMap) {
+    this.directMap = directMap;
+  }
+
+  public MapTest indirectMap(StringBooleanMap indirectMap) {
+    this.indirectMap = indirectMap;
+    return this;
+  }
+
+   /**
+   * Get indirectMap
+   * @return indirectMap
+  **/
+  @ApiModelProperty(value = "")
+  public StringBooleanMap getIndirectMap() {
+    return indirectMap;
+  }
+
+  public void setIndirectMap(StringBooleanMap indirectMap) {
+    this.indirectMap = indirectMap;
+  }
+
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -133,12 +184,14 @@ public class MapTest {
     }
     MapTest mapTest = (MapTest) o;
     return Objects.equals(this.mapMapOfString, mapTest.mapMapOfString) &&
-        Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString);
+        Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString) &&
+        Objects.equals(this.directMap, mapTest.directMap) &&
+        Objects.equals(this.indirectMap, mapTest.indirectMap);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(mapMapOfString, mapOfEnumString);
+    return Objects.hash(mapMapOfString, mapOfEnumString, directMap, indirectMap);
   }
 
 
@@ -149,6 +202,8 @@ public class MapTest {
     
     sb.append("    mapMapOfString: ").append(toIndentedString(mapMapOfString)).append("\n");
     sb.append("    mapOfEnumString: ").append(toIndentedString(mapOfEnumString)).append("\n");
+    sb.append("    directMap: ").append(toIndentedString(directMap)).append("\n");
+    sb.append("    indirectMap: ").append(toIndentedString(indirectMap)).append("\n");
     sb.append("}");
     return sb.toString();
   }

samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/OuterComposite.java

@@ -82,7 +82,7 @@ public class OuterComposite {
    * @return myBoolean
   **/
   @ApiModelProperty(value = "")
-  public Boolean getMyBoolean() {
+  public Boolean isMyBoolean() {
     return myBoolean;
   }
 

samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/StringBooleanMap.java

@@ -0,0 +1,65 @@
+/*
+ * OpenAPI 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
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * StringBooleanMap
+ */
+
+public class StringBooleanMap extends HashMap<String, Boolean> {
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    return super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class StringBooleanMap {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).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/jersey1/docs/MapTest.md

@@ -6,6 +6,8 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **mapMapOfString** | [**Map<String, Map<String, String>>**](Map.md) |  |  [optional]
 **mapOfEnumString** | [**Map<String, InnerEnum>**](#Map<String, InnerEnum>) |  |  [optional]
+**directMap** | **Map<String, Boolean>** |  |  [optional]
+**indirectMap** | [**StringBooleanMap**](StringBooleanMap.md) |  |  [optional]
 
 
 <a name="Map<String, InnerEnum>"></a>

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

@@ -0,0 +1,9 @@
+
+# StringBooleanMap
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+
+

samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MapTest.java

@@ -23,6 +23,7 @@ import io.swagger.annotations.ApiModelProperty;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.openapitools.client.model.StringBooleanMap;
 
 /**
  * MapTest
@@ -70,6 +71,12 @@ public class MapTest {
   @JsonProperty("map_of_enum_string")
   private Map<String, InnerEnum> mapOfEnumString = null;
 
+  @JsonProperty("direct_map")
+  private Map<String, Boolean> directMap = null;
+
+  @JsonProperty("indirect_map")
+  private StringBooleanMap indirectMap = null;
+
   public MapTest mapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
     this.mapMapOfString = mapMapOfString;
     return this;
@@ -122,6 +129,50 @@ public class MapTest {
     this.mapOfEnumString = mapOfEnumString;
   }
 
+  public MapTest directMap(Map<String, Boolean> directMap) {
+    this.directMap = directMap;
+    return this;
+  }
+
+  public MapTest putDirectMapItem(String key, Boolean directMapItem) {
+    if (this.directMap == null) {
+      this.directMap = new HashMap<String, Boolean>();
+    }
+    this.directMap.put(key, directMapItem);
+    return this;
+  }
+
+   /**
+   * Get directMap
+   * @return directMap
+  **/
+  @ApiModelProperty(value = "")
+  public Map<String, Boolean> getDirectMap() {
+    return directMap;
+  }
+
+  public void setDirectMap(Map<String, Boolean> directMap) {
+    this.directMap = directMap;
+  }
+
+  public MapTest indirectMap(StringBooleanMap indirectMap) {
+    this.indirectMap = indirectMap;
+    return this;
+  }
+
+   /**
+   * Get indirectMap
+   * @return indirectMap
+  **/
+  @ApiModelProperty(value = "")
+  public StringBooleanMap getIndirectMap() {
+    return indirectMap;
+  }
+
+  public void setIndirectMap(StringBooleanMap indirectMap) {
+    this.indirectMap = indirectMap;
+  }
+
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -133,12 +184,14 @@ public class MapTest {
     }
     MapTest mapTest = (MapTest) o;
     return Objects.equals(this.mapMapOfString, mapTest.mapMapOfString) &&
-        Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString);
+        Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString) &&
+        Objects.equals(this.directMap, mapTest.directMap) &&
+        Objects.equals(this.indirectMap, mapTest.indirectMap);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(mapMapOfString, mapOfEnumString);
+    return Objects.hash(mapMapOfString, mapOfEnumString, directMap, indirectMap);
   }
 
 
@@ -149,6 +202,8 @@ public class MapTest {
     
     sb.append("    mapMapOfString: ").append(toIndentedString(mapMapOfString)).append("\n");
     sb.append("    mapOfEnumString: ").append(toIndentedString(mapOfEnumString)).append("\n");
+    sb.append("    directMap: ").append(toIndentedString(directMap)).append("\n");
+    sb.append("    indirectMap: ").append(toIndentedString(indirectMap)).append("\n");
     sb.append("}");
     return sb.toString();
   }

samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/OuterComposite.java

@@ -82,7 +82,7 @@ public class OuterComposite {
    * @return myBoolean
   **/
   @ApiModelProperty(value = "")
-  public Boolean getMyBoolean() {
+  public Boolean isMyBoolean() {
     return myBoolean;
   }
 

samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/StringBooleanMap.java

@@ -0,0 +1,65 @@
+/*
+ * OpenAPI 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
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * StringBooleanMap
+ */
+
+public class StringBooleanMap extends HashMap<String, Boolean> {
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    return super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class StringBooleanMap {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).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/jersey1/src/test/java/org/openapitools/client/ApiClientTest.java

@@ -0,0 +1,292 @@
+package org.openapitools.client;
+
+import org.openapitools.client.auth.*;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+import org.junit.*;
+import static org.junit.Assert.*;
+
+
+public class ApiClientTest {
+    ApiClient apiClient = null;
+
+    @Before
+    public void setup() {
+        apiClient = new ApiClient();
+    }
+
+    @Test
+    public void testParseAndFormatDate() {
+        // default date format
+        String dateStr = "2015-11-07T03:49:09.356Z";
+        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T03:49:09.356+00:00")));
+        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T03:49:09.356Z")));
+        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T05:49:09.356+02:00")));
+        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T02:49:09.356-01:00")));
+
+        // custom date format: without milli-seconds, custom time zone
+        DateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
+        format.setTimeZone(TimeZone.getTimeZone("GMT+10"));
+        apiClient.setDateFormat(format);
+        dateStr = "2015-11-07T13:49:09+10:00";
+        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T03:49:09+00:00")));
+        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T03:49:09Z")));
+        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T00:49:09-03:00")));
+        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T13:49:09+10:00")));
+    }
+
+    @Test
+    public void testIsJsonMime() {
+        assertFalse(apiClient.isJsonMime(null));
+        assertFalse(apiClient.isJsonMime(""));
+        assertFalse(apiClient.isJsonMime("text/plain"));
+        assertFalse(apiClient.isJsonMime("application/xml"));
+        assertFalse(apiClient.isJsonMime("application/jsonp"));
+        assertFalse(apiClient.isJsonMime("example/json"));
+        assertFalse(apiClient.isJsonMime("example/foo+bar+jsonx"));
+        assertFalse(apiClient.isJsonMime("example/foo+bar+xjson"));
+
+        assertTrue(apiClient.isJsonMime("application/json"));
+        assertTrue(apiClient.isJsonMime("application/json; charset=UTF8"));
+        assertTrue(apiClient.isJsonMime("APPLICATION/JSON"));
+
+        assertTrue(apiClient.isJsonMime("application/problem+json"));
+        assertTrue(apiClient.isJsonMime("APPLICATION/PROBLEM+JSON"));
+        assertTrue(apiClient.isJsonMime("application/json\t"));
+        assertTrue(apiClient.isJsonMime("example/foo+bar+json"));
+        assertTrue(apiClient.isJsonMime("example/foo+json;x;y"));
+        assertTrue(apiClient.isJsonMime("example/foo+json\t;"));
+        assertTrue(apiClient.isJsonMime("Example/fOO+JSON"));
+    }
+
+    @Test
+    public void testSelectHeaderAccept() {
+        String[] accepts = {"application/json", "application/xml"};
+        assertEquals("application/json", apiClient.selectHeaderAccept(accepts));
+
+        accepts = new String[]{"APPLICATION/XML", "APPLICATION/JSON"};
+        assertEquals("APPLICATION/JSON", apiClient.selectHeaderAccept(accepts));
+
+        accepts = new String[]{"application/xml", "application/json; charset=UTF8"};
+        assertEquals("application/json; charset=UTF8", apiClient.selectHeaderAccept(accepts));
+
+        accepts = new String[]{"text/plain", "application/xml"};
+        assertEquals("text/plain,application/xml", apiClient.selectHeaderAccept(accepts));
+
+        accepts = new String[]{};
+        assertNull(apiClient.selectHeaderAccept(accepts));
+    }
+
+    @Test
+    public void testSelectHeaderContentType() {
+        String[] contentTypes = {"application/json", "application/xml"};
+        assertEquals("application/json", apiClient.selectHeaderContentType(contentTypes));
+
+        contentTypes = new String[]{"APPLICATION/JSON", "APPLICATION/XML"};
+        assertEquals("APPLICATION/JSON", apiClient.selectHeaderContentType(contentTypes));
+
+        contentTypes = new String[]{"application/xml", "application/json; charset=UTF8"};
+        assertEquals("application/json; charset=UTF8", apiClient.selectHeaderContentType(contentTypes));
+
+        contentTypes = new String[]{"text/plain", "application/xml"};
+        assertEquals("text/plain", apiClient.selectHeaderContentType(contentTypes));
+
+        contentTypes = new String[]{};
+        assertEquals("application/json", apiClient.selectHeaderContentType(contentTypes));
+    }
+
+    @Test
+    public void testGetAuthentications() {
+        Map<String, Authentication> auths = apiClient.getAuthentications();
+
+        Authentication auth = auths.get("api_key");
+        assertNotNull(auth);
+        assertTrue(auth instanceof ApiKeyAuth);
+        ApiKeyAuth apiKeyAuth = (ApiKeyAuth) auth;
+        assertEquals("header", apiKeyAuth.getLocation());
+        assertEquals("api_key", apiKeyAuth.getParamName());
+
+        auth = auths.get("petstore_auth");
+        assertTrue(auth instanceof OAuth);
+        assertSame(auth, apiClient.getAuthentication("petstore_auth"));
+
+        assertNull(auths.get("unknown"));
+
+        try {
+            auths.put("my_auth", new HttpBasicAuth());
+            fail("the authentications returned should not be modifiable");
+        } catch (UnsupportedOperationException e) {
+        }
+    }
+
+    @Ignore("There is no more basic auth in petstore security definitions")
+    @Test
+    public void testSetUsernameAndPassword() {
+        HttpBasicAuth auth = null;
+        for (Authentication _auth : apiClient.getAuthentications().values()) {
+            if (_auth instanceof HttpBasicAuth) {
+                auth = (HttpBasicAuth) _auth;
+                break;
+            }
+        }
+        auth.setUsername(null);
+        auth.setPassword(null);
+
+        apiClient.setUsername("my-username");
+        apiClient.setPassword("my-password");
+        assertEquals("my-username", auth.getUsername());
+        assertEquals("my-password", auth.getPassword());
+
+        // reset values
+        auth.setUsername(null);
+        auth.setPassword(null);
+    }
+
+    @Test
+    public void testSetApiKeyAndPrefix() {
+        ApiKeyAuth auth = null;
+        for (Authentication _auth : apiClient.getAuthentications().values()) {
+            if (_auth instanceof ApiKeyAuth) {
+                auth = (ApiKeyAuth) _auth;
+                break;
+            }
+        }
+        auth.setApiKey(null);
+        auth.setApiKeyPrefix(null);
+
+        apiClient.setApiKey("my-api-key");
+        apiClient.setApiKeyPrefix("Token");
+        assertEquals("my-api-key", auth.getApiKey());
+        assertEquals("Token", auth.getApiKeyPrefix());
+
+        // reset values
+        auth.setApiKey(null);
+        auth.setApiKeyPrefix(null);
+    }
+
+    @Test
+    public void testParameterToPairWhenNameIsInvalid() throws Exception {
+        List<Pair> pairs_a = apiClient.parameterToPair(null, new Integer(1));
+        List<Pair> pairs_b = apiClient.parameterToPair("", new Integer(1));
+
+        assertTrue(pairs_a.isEmpty());
+        assertTrue(pairs_b.isEmpty());
+    }
+
+    @Test
+    public void testParameterToPairWhenValueIsNull() throws Exception {
+        List<Pair> pairs = apiClient.parameterToPair("param-a", null);
+
+        assertTrue(pairs.isEmpty());
+    }
+
+    @Test
+    public void testParameterToPairWhenValueIsEmptyString() throws Exception {
+        // single empty string
+        List<Pair> pairs = apiClient.parameterToPair("param-a", " ");
+        assertEquals(1, pairs.size());
+    }
+
+    @Test
+    public void testParameterToPairWhenValueIsNotCollection() throws Exception {
+        String name = "param-a";
+        Integer value = 1;
+
+        List<Pair> pairs = apiClient.parameterToPair(name, value);
+
+        assertEquals(1, pairs.size());
+        assertEquals(value, Integer.valueOf(pairs.get(0).getValue()));
+    }
+
+    @Test
+    public void testParameterToPairWhenValueIsCollection() throws Exception {
+        List<Object> values = new ArrayList<Object>();
+        values.add("value-a");
+        values.add(123);
+        values.add(new Date());
+
+        List<Pair> pairs = apiClient.parameterToPair("param-a", values);
+        assertEquals(0, pairs.size());
+    }
+
+    @Test
+    public void testParameterToPairsWhenNameIsInvalid() throws Exception {
+        List<Integer> objects = new ArrayList<Integer>();
+        objects.add(new Integer(1));
+
+        List<Pair> pairs_a = apiClient.parameterToPairs("csv", null, objects);
+        List<Pair> pairs_b = apiClient.parameterToPairs("csv", "", objects);
+
+        assertTrue(pairs_a.isEmpty());
+        assertTrue(pairs_b.isEmpty());
+    }
+
+    @Test
+    public void testParameterToPairsWhenValueIsNull() throws Exception {
+        List<Pair> pairs = apiClient.parameterToPairs("csv", "param-a", null);
+
+        assertTrue(pairs.isEmpty());
+    }
+
+    @Test
+    public void testParameterToPairsWhenValueIsEmptyStrings() throws Exception {
+        // list of empty strings
+        List<String> strs = new ArrayList<String>();
+        strs.add(" ");
+        strs.add(" ");
+        strs.add(" ");
+
+        List<Pair> concatStrings = apiClient.parameterToPairs("csv", "param-a", strs);
+
+        assertEquals(1, concatStrings.size());
+        assertFalse(concatStrings.get(0).getValue().isEmpty()); // should contain some delimiters
+    }
+
+    @Test
+    public void testParameterToPairsWhenValueIsCollection() throws Exception {
+        Map<String, String> collectionFormatMap = new HashMap<String, String>();
+        collectionFormatMap.put("csv", ",");
+        collectionFormatMap.put("tsv", "\t");
+        collectionFormatMap.put("ssv", " ");
+        collectionFormatMap.put("pipes", "|");
+        collectionFormatMap.put("", ","); // no format, must default to csv
+        collectionFormatMap.put("unknown", ","); // all other formats, must default to csv
+
+        String name = "param-a";
+
+        List<Object> values = new ArrayList<Object>();
+        values.add("value-a");
+        values.add(123);
+        values.add(new Date());
+
+        // check for multi separately
+        List<Pair> multiPairs = apiClient.parameterToPairs("multi", name, values);
+        assertEquals(values.size(), multiPairs.size());
+        for (int i = 0; i < values.size(); i++) {
+            assertEquals(apiClient.escapeString(apiClient.parameterToString(values.get(i))), multiPairs.get(i).getValue());
+        }
+
+        // all other formats
+        for (String collectionFormat : collectionFormatMap.keySet()) {
+            List<Pair> pairs = apiClient.parameterToPairs(collectionFormat, name, values);
+
+            assertEquals(1, pairs.size());
+
+            String delimiter = collectionFormatMap.get(collectionFormat);
+            if (!delimiter.equals(",")) {
+                // commas are not escaped because they are reserved characters in URIs
+                delimiter = apiClient.escapeString(delimiter);
+            }
+            String[] pairValueSplit = pairs.get(0).getValue().split(delimiter);
+
+            // must equal input values
+            assertEquals(values.size(), pairValueSplit.length);
+            for (int i = 0; i < values.size(); i++) {
+                assertEquals(apiClient.escapeString(apiClient.parameterToString(values.get(i))), pairValueSplit[i]);
+            }
+        }
+    }
+}

samples/client/petstore/java/jersey1/src/test/java/org/openapitools/client/ConfigurationTest.java

@@ -0,0 +1,15 @@
+package org.openapitools.client;
+
+import org.junit.*;
+import static org.junit.Assert.*;
+
+
+public class ConfigurationTest {
+    @Test
+    public void testDefaultApiClient() {
+        ApiClient apiClient = Configuration.getDefaultApiClient();
+        assertNotNull(apiClient);
+        assertEquals("http://petstore.swagger.io:80/v2", apiClient.getBasePath());
+        assertFalse(apiClient.isDebugging());
+    }
+}

samples/client/petstore/java/jersey1/src/test/java/org/openapitools/client/StringUtilTest.java

@@ -0,0 +1,33 @@
+package org.openapitools.client;
+
+import org.junit.*;
+import static org.junit.Assert.*;
+
+
+public class StringUtilTest {
+    @Test
+    public void testContainsIgnoreCase() {
+        assertTrue(StringUtil.containsIgnoreCase(new String[]{"abc"}, "abc"));
+        assertTrue(StringUtil.containsIgnoreCase(new String[]{"abc"}, "ABC"));
+        assertTrue(StringUtil.containsIgnoreCase(new String[]{"ABC"}, "abc"));
+        assertTrue(StringUtil.containsIgnoreCase(new String[]{null, "abc"}, "ABC"));
+        assertTrue(StringUtil.containsIgnoreCase(new String[]{null, "abc"}, null));
+
+        assertFalse(StringUtil.containsIgnoreCase(new String[]{"abc"}, "def"));
+        assertFalse(StringUtil.containsIgnoreCase(new String[]{}, "ABC"));
+        assertFalse(StringUtil.containsIgnoreCase(new String[]{}, null));
+    }
+
+    @Test
+    public void testJoin() {
+        String[] array = {"aa", "bb", "cc"};
+        assertEquals("aa,bb,cc", StringUtil.join(array, ","));
+        assertEquals("aa, bb, cc", StringUtil.join(array, ", "));
+        assertEquals("aabbcc", StringUtil.join(array, ""));
+        assertEquals("aa bb cc", StringUtil.join(array, " "));
+        assertEquals("aa\nbb\ncc", StringUtil.join(array, "\n"));
+
+        assertEquals("", StringUtil.join(new String[]{}, ","));
+        assertEquals("abc", StringUtil.join(new String[]{"abc"}, ","));
+    }
+}

samples/client/petstore/java/jersey1/src/test/java/org/openapitools/client/auth/ApiKeyAuthTest.java

@@ -0,0 +1,47 @@
+package org.openapitools.client.auth;
+
+import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.List;
+
+import org.openapitools.client.Pair;
+import org.junit.*;
+import static org.junit.Assert.*;
+
+
+public class ApiKeyAuthTest {
+    @Test
+    public void testApplyToParamsInQuery() {
+        List<Pair> queryParams = new ArrayList<Pair>();
+        Map<String, String> headerParams = new HashMap<String, String>();
+
+        ApiKeyAuth auth = new ApiKeyAuth("query", "api_key");
+        auth.setApiKey("my-api-key");
+        auth.applyToParams(queryParams, headerParams);
+
+        assertEquals(1, queryParams.size());
+        for (Pair queryParam : queryParams) {
+            assertEquals("my-api-key", queryParam.getValue());
+        }
+
+        // no changes to header parameters
+        assertEquals(0, headerParams.size());
+    }
+
+    @Test
+    public void testApplyToParamsInHeaderWithPrefix() {
+            List<Pair> queryParams = new ArrayList<Pair>();
+        Map<String, String> headerParams = new HashMap<String, String>();
+
+        ApiKeyAuth auth = new ApiKeyAuth("header", "X-API-TOKEN");
+        auth.setApiKey("my-api-token");
+        auth.setApiKeyPrefix("Token");
+        auth.applyToParams(queryParams, headerParams);
+
+        // no changes to query parameters
+        assertEquals(0, queryParams.size());
+        assertEquals(1, headerParams.size());
+        assertEquals("Token my-api-token", headerParams.get("X-API-TOKEN"));
+    }
+}

samples/client/petstore/java/jersey1/src/test/java/org/openapitools/client/auth/HttpBasicAuthTest.java

@@ -0,0 +1,52 @@
+package org.openapitools.client.auth;
+
+import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.List;
+
+import org.openapitools.client.Pair;
+import org.junit.*;
+import static org.junit.Assert.*;
+
+
+public class HttpBasicAuthTest {
+    HttpBasicAuth auth = null;
+
+    @Before
+    public void setup() {
+        auth = new HttpBasicAuth();
+    }
+
+    @Test
+    public void testApplyToParams() {
+        List<Pair> queryParams = new ArrayList<Pair>();
+        Map<String, String> headerParams = new HashMap<String, String>();
+
+        auth.setUsername("my-username");
+        auth.setPassword("my-password");
+        auth.applyToParams(queryParams, headerParams);
+
+        // no changes to query parameters
+        assertEquals(0, queryParams.size());
+        assertEquals(1, headerParams.size());
+        // the string below is base64-encoded result of "my-username:my-password" with the "Basic " prefix
+        String expected = "Basic bXktdXNlcm5hbWU6bXktcGFzc3dvcmQ=";
+        assertEquals(expected, headerParams.get("Authorization"));
+
+        // null username should be treated as empty string
+        auth.setUsername(null);
+        auth.applyToParams(queryParams, headerParams);
+        // the string below is base64-encoded result of ":my-password" with the "Basic " prefix
+        expected = "Basic Om15LXBhc3N3b3Jk";
+        assertEquals(expected, headerParams.get("Authorization"));
+
+        // null password should be treated as empty string
+        auth.setUsername("my-username");
+        auth.setPassword(null);
+        auth.applyToParams(queryParams, headerParams);
+        // the string below is base64-encoded result of "my-username:" with the "Basic " prefix
+        expected = "Basic bXktdXNlcm5hbWU6";
+        assertEquals(expected, headerParams.get("Authorization"));
+    }
+}

samples/client/petstore/java/jersey1/src/test/java/org/openapitools/client/model/EnumValueTest.java

@@ -0,0 +1,63 @@
+package org.openapitools.client.model;
+
+import org.junit.Test;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectWriter;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+public class EnumValueTest {
+
+    @Test
+    public void testEnumClass() {
+        assertEquals(EnumClass._ABC.toString(), "_abc");
+        assertEquals(EnumClass._EFG.toString(), "-efg");
+        assertEquals(EnumClass._XYZ_.toString(), "(xyz)");
+    }
+
+    @Test
+    public void testEnumTest() {
+        // test enum value
+        EnumTest enumTest = new EnumTest();
+        enumTest.setEnumString(EnumTest.EnumStringEnum.LOWER);
+        enumTest.setEnumInteger(EnumTest.EnumIntegerEnum.NUMBER_1);
+        enumTest.setEnumNumber(EnumTest.EnumNumberEnum.NUMBER_1_DOT_1);
+
+        assertEquals(EnumTest.EnumStringEnum.UPPER.toString(), "UPPER");
+        assertEquals(EnumTest.EnumStringEnum.UPPER.getValue(), "UPPER");
+        assertEquals(EnumTest.EnumStringEnum.LOWER.toString(), "lower");
+        assertEquals(EnumTest.EnumStringEnum.LOWER.getValue(), "lower");
+
+        assertEquals(EnumTest.EnumIntegerEnum.NUMBER_1.toString(), "1");
+        assertTrue(EnumTest.EnumIntegerEnum.NUMBER_1.getValue() == 1);
+        assertEquals(EnumTest.EnumIntegerEnum.NUMBER_MINUS_1.toString(), "-1");
+        assertTrue(EnumTest.EnumIntegerEnum.NUMBER_MINUS_1.getValue() == -1);
+
+        assertEquals(EnumTest.EnumNumberEnum.NUMBER_1_DOT_1.toString(), "1.1");
+        assertTrue(EnumTest.EnumNumberEnum.NUMBER_1_DOT_1.getValue() == 1.1);
+        assertEquals(EnumTest.EnumNumberEnum.NUMBER_MINUS_1_DOT_2.toString(), "-1.2");
+        assertTrue(EnumTest.EnumNumberEnum.NUMBER_MINUS_1_DOT_2.getValue() == -1.2);
+
+        try {
+            // test serialization (object => json)
+            ObjectMapper mapper = new ObjectMapper();
+            mapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
+            ObjectWriter ow = mapper.writer();
+            String json = ow.writeValueAsString(enumTest);
+            assertEquals(json, "{\"enum_string\":\"lower\",\"enum_string_required\":null,\"enum_integer\":1,\"enum_number\":1.1,\"outerEnum\":null}");
+
+            // test deserialization (json => object)
+            EnumTest fromString = mapper.readValue(json, EnumTest.class);
+            assertEquals(fromString.getEnumString().toString(), "lower");
+            assertEquals(fromString.getEnumInteger().toString(), "1");
+            assertEquals(fromString.getEnumNumber().toString(), "1.1");
+
+        } catch (Exception e) {
+            fail("Exception thrown during serialization/deserialzation of JSON: " + e.getMessage());
+        }
+    }
+}

samples/client/petstore/java/jersey2-java6/docs/MapTest.md

@@ -6,6 +6,8 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **mapMapOfString** | [**Map<String, Map<String, String>>**](Map.md) |  |  [optional]
 **mapOfEnumString** | [**Map<String, InnerEnum>**](#Map<String, InnerEnum>) |  |  [optional]
+**directMap** | **Map<String, Boolean>** |  |  [optional]
+**indirectMap** | [**StringBooleanMap**](StringBooleanMap.md) |  |  [optional]
 
 
 <a name="Map<String, InnerEnum>"></a>

samples/client/petstore/java/jersey2-java6/docs/StringBooleanMap.md

@@ -0,0 +1,9 @@
+
+# StringBooleanMap
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+
+

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/MapTest.java

@@ -22,6 +22,7 @@ import io.swagger.annotations.ApiModelProperty;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.openapitools.client.model.StringBooleanMap;
 
 /**
  * MapTest
@@ -69,6 +70,12 @@ public class MapTest {
   @JsonProperty("map_of_enum_string")
   private Map<String, InnerEnum> mapOfEnumString = null;
 
+  @JsonProperty("direct_map")
+  private Map<String, Boolean> directMap = null;
+
+  @JsonProperty("indirect_map")
+  private StringBooleanMap indirectMap = null;
+
   public MapTest mapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
     this.mapMapOfString = mapMapOfString;
     return this;
@@ -121,6 +128,50 @@ public class MapTest {
     this.mapOfEnumString = mapOfEnumString;
   }
 
+  public MapTest directMap(Map<String, Boolean> directMap) {
+    this.directMap = directMap;
+    return this;
+  }
+
+  public MapTest putDirectMapItem(String key, Boolean directMapItem) {
+    if (this.directMap == null) {
+      this.directMap = new HashMap<String, Boolean>();
+    }
+    this.directMap.put(key, directMapItem);
+    return this;
+  }
+
+   /**
+   * Get directMap
+   * @return directMap
+  **/
+  @ApiModelProperty(value = "")
+  public Map<String, Boolean> getDirectMap() {
+    return directMap;
+  }
+
+  public void setDirectMap(Map<String, Boolean> directMap) {
+    this.directMap = directMap;
+  }
+
+  public MapTest indirectMap(StringBooleanMap indirectMap) {
+    this.indirectMap = indirectMap;
+    return this;
+  }
+
+   /**
+   * Get indirectMap
+   * @return indirectMap
+  **/
+  @ApiModelProperty(value = "")
+  public StringBooleanMap getIndirectMap() {
+    return indirectMap;
+  }
+
+  public void setIndirectMap(StringBooleanMap indirectMap) {
+    this.indirectMap = indirectMap;
+  }
+
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -132,12 +183,14 @@ public class MapTest {
   }
     MapTest mapTest = (MapTest) o;
     return ObjectUtils.equals(this.mapMapOfString, mapTest.mapMapOfString) &&
-    ObjectUtils.equals(this.mapOfEnumString, mapTest.mapOfEnumString);
+    ObjectUtils.equals(this.mapOfEnumString, mapTest.mapOfEnumString) &&
+    ObjectUtils.equals(this.directMap, mapTest.directMap) &&
+    ObjectUtils.equals(this.indirectMap, mapTest.indirectMap);
   }
 
   @Override
   public int hashCode() {
-    return ObjectUtils.hashCodeMulti(mapMapOfString, mapOfEnumString);
+    return ObjectUtils.hashCodeMulti(mapMapOfString, mapOfEnumString, directMap, indirectMap);
   }
 
 
@@ -148,6 +201,8 @@ public class MapTest {
     
     sb.append("    mapMapOfString: ").append(toIndentedString(mapMapOfString)).append("\n");
     sb.append("    mapOfEnumString: ").append(toIndentedString(mapOfEnumString)).append("\n");
+    sb.append("    directMap: ").append(toIndentedString(directMap)).append("\n");
+    sb.append("    indirectMap: ").append(toIndentedString(indirectMap)).append("\n");
     sb.append("}");
     return sb.toString();
   }

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/OuterComposite.java

@@ -81,7 +81,7 @@ public class OuterComposite {
    * @return myBoolean
   **/
   @ApiModelProperty(value = "")
-  public Boolean getMyBoolean() {
+  public Boolean isMyBoolean() {
     return myBoolean;
   }
 

samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/StringBooleanMap.java

@@ -0,0 +1,64 @@
+/*
+ * OpenAPI 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
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import org.apache.commons.lang3.ObjectUtils;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * StringBooleanMap
+ */
+
+public class StringBooleanMap extends HashMap<String, Boolean> {
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+  if (this == o) {
+    return true;
+  }
+  if (o == null || getClass() != o.getClass()) {
+    return false;
+  }
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return ObjectUtils.hashCodeMulti(super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class StringBooleanMap {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).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/jersey2-java8/docs/MapTest.md

@@ -6,6 +6,8 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **mapMapOfString** | [**Map<String, Map<String, String>>**](Map.md) |  |  [optional]
 **mapOfEnumString** | [**Map<String, InnerEnum>**](#Map<String, InnerEnum>) |  |  [optional]
+**directMap** | **Map<String, Boolean>** |  |  [optional]
+**indirectMap** | [**StringBooleanMap**](StringBooleanMap.md) |  |  [optional]
 
 
 <a name="Map<String, InnerEnum>"></a>

samples/client/petstore/java/jersey2-java8/docs/StringBooleanMap.md

@@ -0,0 +1,9 @@
+
+# StringBooleanMap
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+
+

samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MapTest.java

@@ -23,6 +23,7 @@ import io.swagger.annotations.ApiModelProperty;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.openapitools.client.model.StringBooleanMap;
 
 /**
  * MapTest
@@ -70,6 +71,12 @@ public class MapTest {
   @JsonProperty("map_of_enum_string")
   private Map<String, InnerEnum> mapOfEnumString = null;
 
+  @JsonProperty("direct_map")
+  private Map<String, Boolean> directMap = null;
+
+  @JsonProperty("indirect_map")
+  private StringBooleanMap indirectMap = null;
+
   public MapTest mapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
     this.mapMapOfString = mapMapOfString;
     return this;
@@ -122,6 +129,50 @@ public class MapTest {
     this.mapOfEnumString = mapOfEnumString;
   }
 
+  public MapTest directMap(Map<String, Boolean> directMap) {
+    this.directMap = directMap;
+    return this;
+  }
+
+  public MapTest putDirectMapItem(String key, Boolean directMapItem) {
+    if (this.directMap == null) {
+      this.directMap = new HashMap<>();
+    }
+    this.directMap.put(key, directMapItem);
+    return this;
+  }
+
+   /**
+   * Get directMap
+   * @return directMap
+  **/
+  @ApiModelProperty(value = "")
+  public Map<String, Boolean> getDirectMap() {
+    return directMap;
+  }
+
+  public void setDirectMap(Map<String, Boolean> directMap) {
+    this.directMap = directMap;
+  }
+
+  public MapTest indirectMap(StringBooleanMap indirectMap) {
+    this.indirectMap = indirectMap;
+    return this;
+  }
+
+   /**
+   * Get indirectMap
+   * @return indirectMap
+  **/
+  @ApiModelProperty(value = "")
+  public StringBooleanMap getIndirectMap() {
+    return indirectMap;
+  }
+
+  public void setIndirectMap(StringBooleanMap indirectMap) {
+    this.indirectMap = indirectMap;
+  }
+
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -133,12 +184,14 @@ public class MapTest {
     }
     MapTest mapTest = (MapTest) o;
     return Objects.equals(this.mapMapOfString, mapTest.mapMapOfString) &&
-        Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString);
+        Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString) &&
+        Objects.equals(this.directMap, mapTest.directMap) &&
+        Objects.equals(this.indirectMap, mapTest.indirectMap);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(mapMapOfString, mapOfEnumString);
+    return Objects.hash(mapMapOfString, mapOfEnumString, directMap, indirectMap);
   }
 
 
@@ -149,6 +202,8 @@ public class MapTest {
     
     sb.append("    mapMapOfString: ").append(toIndentedString(mapMapOfString)).append("\n");
     sb.append("    mapOfEnumString: ").append(toIndentedString(mapOfEnumString)).append("\n");
+    sb.append("    directMap: ").append(toIndentedString(directMap)).append("\n");
+    sb.append("    indirectMap: ").append(toIndentedString(indirectMap)).append("\n");
     sb.append("}");
     return sb.toString();
   }

samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterComposite.java

@@ -82,7 +82,7 @@ public class OuterComposite {
    * @return myBoolean
   **/
   @ApiModelProperty(value = "")
-  public Boolean getMyBoolean() {
+  public Boolean isMyBoolean() {
     return myBoolean;
   }
 

samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/StringBooleanMap.java

@@ -0,0 +1,65 @@
+/*
+ * OpenAPI 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
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * StringBooleanMap
+ */
+
+public class StringBooleanMap extends HashMap<String, Boolean> {
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    return super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class StringBooleanMap {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).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/jersey2-java8/src/test/java/org/openapitools/client/ApiClientTest.java

@@ -0,0 +1,250 @@
+package org.openapitools.client;
+
+import org.openapitools.client.auth.*;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+import org.junit.*;
+import static org.junit.Assert.*;
+
+
+public class ApiClientTest {
+    ApiClient apiClient = null;
+
+    @Before
+    public void setup() {
+        apiClient = new ApiClient();
+    }
+
+    @Test
+    public void testParseAndFormatDate() {
+        // default date format
+        String dateStr = "2015-11-07T03:49:09.356Z";
+        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T03:49:09.356+00:00")));
+        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T03:49:09.356Z")));
+        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T05:49:09.356+02:00")));
+        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T02:49:09.356-01:00")));
+
+        // custom date format: without milli-seconds, custom time zone
+        DateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
+        format.setTimeZone(TimeZone.getTimeZone("GMT+10"));
+        apiClient.setDateFormat(format);
+        dateStr = "2015-11-07T13:49:09+10:00";
+        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T03:49:09+00:00")));
+        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T03:49:09Z")));
+        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T00:49:09-03:00")));
+        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T13:49:09+10:00")));
+    }
+
+    @Test
+    public void testIsJsonMime() {
+        assertFalse(apiClient.isJsonMime(null));
+        assertFalse(apiClient.isJsonMime(""));
+        assertFalse(apiClient.isJsonMime("text/plain"));
+        assertFalse(apiClient.isJsonMime("application/xml"));
+        assertFalse(apiClient.isJsonMime("application/jsonp"));
+        assertFalse(apiClient.isJsonMime("example/json"));
+        assertFalse(apiClient.isJsonMime("example/foo+bar+jsonx"));
+        assertFalse(apiClient.isJsonMime("example/foo+bar+xjson"));
+
+        assertTrue(apiClient.isJsonMime("application/json"));
+        assertTrue(apiClient.isJsonMime("application/json; charset=UTF8"));
+        assertTrue(apiClient.isJsonMime("APPLICATION/JSON"));
+
+        assertTrue(apiClient.isJsonMime("application/problem+json"));
+        assertTrue(apiClient.isJsonMime("APPLICATION/PROBLEM+JSON"));
+        assertTrue(apiClient.isJsonMime("application/json\t"));
+        assertTrue(apiClient.isJsonMime("example/foo+bar+json"));
+        assertTrue(apiClient.isJsonMime("example/foo+json;x;y"));
+        assertTrue(apiClient.isJsonMime("example/foo+json\t;"));
+        assertTrue(apiClient.isJsonMime("Example/fOO+JSON"));
+    }
+
+    @Test
+    public void testSelectHeaderAccept() {
+        String[] accepts = {"application/json", "application/xml"};
+        assertEquals("application/json", apiClient.selectHeaderAccept(accepts));
+
+        accepts = new String[]{"APPLICATION/XML", "APPLICATION/JSON"};
+        assertEquals("APPLICATION/JSON", apiClient.selectHeaderAccept(accepts));
+
+        accepts = new String[]{"application/xml", "application/json; charset=UTF8"};
+        assertEquals("application/json; charset=UTF8", apiClient.selectHeaderAccept(accepts));
+
+        accepts = new String[]{"text/plain", "application/xml"};
+        assertEquals("text/plain,application/xml", apiClient.selectHeaderAccept(accepts));
+
+        accepts = new String[]{};
+        assertNull(apiClient.selectHeaderAccept(accepts));
+    }
+
+    @Test
+    public void testSelectHeaderContentType() {
+        String[] contentTypes = {"application/json", "application/xml"};
+        assertEquals("application/json", apiClient.selectHeaderContentType(contentTypes));
+
+        contentTypes = new String[]{"APPLICATION/JSON", "APPLICATION/XML"};
+        assertEquals("APPLICATION/JSON", apiClient.selectHeaderContentType(contentTypes));
+
+        contentTypes = new String[]{"application/xml", "application/json; charset=UTF8"};
+        assertEquals("application/json; charset=UTF8", apiClient.selectHeaderContentType(contentTypes));
+
+        contentTypes = new String[]{"text/plain", "application/xml"};
+        assertEquals("text/plain", apiClient.selectHeaderContentType(contentTypes));
+
+        contentTypes = new String[]{};
+        assertEquals("application/json", apiClient.selectHeaderContentType(contentTypes));
+    }
+
+    @Test
+    public void testGetAuthentications() {
+        Map<String, Authentication> auths = apiClient.getAuthentications();
+
+        Authentication auth = auths.get("api_key");
+        assertNotNull(auth);
+        assertTrue(auth instanceof ApiKeyAuth);
+        ApiKeyAuth apiKeyAuth = (ApiKeyAuth) auth;
+        assertEquals("header", apiKeyAuth.getLocation());
+        assertEquals("api_key", apiKeyAuth.getParamName());
+
+        auth = auths.get("petstore_auth");
+        assertTrue(auth instanceof OAuth);
+        assertSame(auth, apiClient.getAuthentication("petstore_auth"));
+
+        assertNull(auths.get("unknown"));
+
+        try {
+            auths.put("my_auth", new HttpBasicAuth());
+            fail("the authentications returned should not be modifiable");
+        } catch (UnsupportedOperationException e) {
+        }
+    }
+
+    @Ignore("There is no more basic auth in petstore security definitions")
+    @Test
+    public void testSetUsernameAndPassword() {
+        HttpBasicAuth auth = null;
+        for (Authentication _auth : apiClient.getAuthentications().values()) {
+            if (_auth instanceof HttpBasicAuth) {
+                auth = (HttpBasicAuth) _auth;
+                break;
+            }
+        }
+        auth.setUsername(null);
+        auth.setPassword(null);
+
+        apiClient.setUsername("my-username");
+        apiClient.setPassword("my-password");
+        assertEquals("my-username", auth.getUsername());
+        assertEquals("my-password", auth.getPassword());
+
+        // reset values
+        auth.setUsername(null);
+        auth.setPassword(null);
+    }
+
+    @Test
+    public void testSetApiKeyAndPrefix() {
+        ApiKeyAuth auth = null;
+        for (Authentication _auth : apiClient.getAuthentications().values()) {
+            if (_auth instanceof ApiKeyAuth) {
+                auth = (ApiKeyAuth) _auth;
+                break;
+            }
+        }
+        auth.setApiKey(null);
+        auth.setApiKeyPrefix(null);
+
+        apiClient.setApiKey("my-api-key");
+        apiClient.setApiKeyPrefix("Token");
+        assertEquals("my-api-key", auth.getApiKey());
+        assertEquals("Token", auth.getApiKeyPrefix());
+
+        // reset values
+        auth.setApiKey(null);
+        auth.setApiKeyPrefix(null);
+    }
+
+    @Test
+    public void testParameterToPairsWhenNameIsInvalid() throws Exception {
+        List<Pair> pairs_a = apiClient.parameterToPairs("csv", null, new Integer(1));
+        List<Pair> pairs_b = apiClient.parameterToPairs("csv", "", new Integer(1));
+
+        assertTrue(pairs_a.isEmpty());
+        assertTrue(pairs_b.isEmpty());
+    }
+
+    @Test
+    public void testParameterToPairsWhenValueIsNull() throws Exception {
+        List<Pair> pairs = apiClient.parameterToPairs("csv", "param-a", null);
+
+        assertTrue(pairs.isEmpty());
+    }
+
+    @Test
+    public void testParameterToPairsWhenValueIsEmptyStrings() throws Exception {
+
+        // single empty string
+        List<Pair> pairs = apiClient.parameterToPairs("csv", "param-a", " ");
+        assertEquals(1, pairs.size());
+
+        // list of empty strings
+        List<String> strs = new ArrayList<String>();
+        strs.add(" ");
+        strs.add(" ");
+        strs.add(" ");
+
+        List<Pair> concatStrings = apiClient.parameterToPairs("csv", "param-a", strs);
+
+        assertEquals(1, concatStrings.size());
+        assertFalse(concatStrings.get(0).getValue().isEmpty()); // should contain some delimiters
+    }
+
+    @Test
+    public void testParameterToPairsWhenValueIsNotCollection() throws Exception {
+        String name = "param-a";
+        Integer value = 1;
+
+        List<Pair> pairs = apiClient.parameterToPairs("csv", name, value);
+
+        assertEquals(1, pairs.size());
+        assertEquals(value, Integer.valueOf(pairs.get(0).getValue()));
+    }
+
+    @Test
+    public void testParameterToPairsWhenValueIsCollection() throws Exception {
+        Map<String, String> collectionFormatMap = new HashMap<String, String>();
+        collectionFormatMap.put("csv", ",");
+        collectionFormatMap.put("tsv", "\t");
+        collectionFormatMap.put("ssv", " ");
+        collectionFormatMap.put("pipes", "\\|");
+        collectionFormatMap.put("", ","); // no format, must default to csv
+        collectionFormatMap.put("unknown", ","); // all other formats, must default to csv
+
+        String name = "param-a";
+
+        List<Object> values = new ArrayList<Object>();
+        values.add("value-a");
+        values.add(123);
+        values.add(new Date());
+
+        // check for multi separately
+        List<Pair> multiPairs = apiClient.parameterToPairs("multi", name, values);
+        assertEquals(values.size(), multiPairs.size());
+
+        // all other formats
+        for (String collectionFormat : collectionFormatMap.keySet()) {
+            List<Pair> pairs = apiClient.parameterToPairs(collectionFormat, name, values);
+
+            assertEquals(1, pairs.size());
+
+            String delimiter = collectionFormatMap.get(collectionFormat);
+            String[] pairValueSplit = pairs.get(0).getValue().split(delimiter);
+
+            // must equal input values
+            assertEquals(values.size(), pairValueSplit.length);
+        }
+    }
+}

samples/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/ConfigurationTest.java

@@ -0,0 +1,15 @@
+package org.openapitools.client;
+
+import org.junit.*;
+import static org.junit.Assert.*;
+
+
+public class ConfigurationTest {
+    @Test
+    public void testDefaultApiClient() {
+        ApiClient apiClient = Configuration.getDefaultApiClient();
+        assertNotNull(apiClient);
+        assertEquals("http://petstore.swagger.io:80/v2", apiClient.getBasePath());
+        assertFalse(apiClient.isDebugging());
+    }
+}

samples/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/JSONTest.java

@@ -0,0 +1,45 @@
+package org.openapitools.client;
+
+import org.openapitools.client.model.Order;
+
+import java.lang.Exception;
+
+import java.time.OffsetDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import org.junit.*;
+import static org.junit.Assert.*;
+
+
+public class JSONTest {
+    JSON json = null;
+    Order order = null;
+
+    @Before
+    public void setup() {
+        json = new JSON();
+        order = new Order();
+    }
+
+    @Test
+    public void testDefaultDate() throws Exception {
+        final DateTimeFormatter dateFormat = DateTimeFormatter.ISO_OFFSET_DATE_TIME;
+        final String dateStr = "2015-11-07T14:11:05.267Z";
+        order.setShipDate(dateFormat.parse(dateStr, OffsetDateTime::from));
+
+        String str = json.getContext(null).writeValueAsString(order);
+        Order o = json.getContext(null).readValue(str, Order.class);
+        assertEquals(dateStr, dateFormat.format(o.getShipDate()));
+    }
+
+    @Test
+    public void testCustomDate() throws Exception {
+        final DateTimeFormatter dateFormat = DateTimeFormatter.ISO_OFFSET_DATE_TIME.withZone(ZoneId.of("Etc/GMT+2"));
+        final String dateStr = "2015-11-07T14:11:05-02:00";
+        order.setShipDate(dateFormat.parse(dateStr, OffsetDateTime::from));
+
+        String str = json.getContext(null).writeValueAsString(order);
+        Order o = json.getContext(null).readValue(str, Order.class);
+        assertEquals(dateStr, dateFormat.format(o.getShipDate()));
+    }
+}

samples/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/StringUtilTest.java

@@ -0,0 +1,33 @@
+package org.openapitools.client;
+
+import org.junit.*;
+import static org.junit.Assert.*;
+
+
+public class StringUtilTest {
+    @Test
+    public void testContainsIgnoreCase() {
+        assertTrue(StringUtil.containsIgnoreCase(new String[]{"abc"}, "abc"));
+        assertTrue(StringUtil.containsIgnoreCase(new String[]{"abc"}, "ABC"));
+        assertTrue(StringUtil.containsIgnoreCase(new String[]{"ABC"}, "abc"));
+        assertTrue(StringUtil.containsIgnoreCase(new String[]{null, "abc"}, "ABC"));
+        assertTrue(StringUtil.containsIgnoreCase(new String[]{null, "abc"}, null));
+
+        assertFalse(StringUtil.containsIgnoreCase(new String[]{"abc"}, "def"));
+        assertFalse(StringUtil.containsIgnoreCase(new String[]{}, "ABC"));
+        assertFalse(StringUtil.containsIgnoreCase(new String[]{}, null));
+    }
+
+    @Test
+    public void testJoin() {
+        String[] array = {"aa", "bb", "cc"};
+        assertEquals("aa,bb,cc", StringUtil.join(array, ","));
+        assertEquals("aa, bb, cc", StringUtil.join(array, ", "));
+        assertEquals("aabbcc", StringUtil.join(array, ""));
+        assertEquals("aa bb cc", StringUtil.join(array, " "));
+        assertEquals("aa\nbb\ncc", StringUtil.join(array, "\n"));
+
+        assertEquals("", StringUtil.join(new String[]{}, ","));
+        assertEquals("abc", StringUtil.join(new String[]{"abc"}, ","));
+    }
+}

samples/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/auth/ApiKeyAuthTest.java

@@ -0,0 +1,47 @@
+package org.openapitools.client.auth;
+
+import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.List;
+
+import org.openapitools.client.Pair;
+import org.junit.*;
+import static org.junit.Assert.*;
+
+
+public class ApiKeyAuthTest {
+    @Test
+    public void testApplyToParamsInQuery() {
+        List<Pair> queryParams = new ArrayList<Pair>();
+        Map<String, String> headerParams = new HashMap<String, String>();
+
+        ApiKeyAuth auth = new ApiKeyAuth("query", "api_key");
+        auth.setApiKey("my-api-key");
+        auth.applyToParams(queryParams, headerParams);
+
+        assertEquals(1, queryParams.size());
+        for (Pair queryParam : queryParams) {
+            assertEquals("my-api-key", queryParam.getValue());
+        }
+
+        // no changes to header parameters
+        assertEquals(0, headerParams.size());
+    }
+
+    @Test
+    public void testApplyToParamsInHeaderWithPrefix() {
+            List<Pair> queryParams = new ArrayList<Pair>();
+        Map<String, String> headerParams = new HashMap<String, String>();
+
+        ApiKeyAuth auth = new ApiKeyAuth("header", "X-API-TOKEN");
+        auth.setApiKey("my-api-token");
+        auth.setApiKeyPrefix("Token");
+        auth.applyToParams(queryParams, headerParams);
+
+        // no changes to query parameters
+        assertEquals(0, queryParams.size());
+        assertEquals(1, headerParams.size());
+        assertEquals("Token my-api-token", headerParams.get("X-API-TOKEN"));
+    }
+}

samples/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/auth/HttpBasicAuthTest.java

@@ -0,0 +1,52 @@
+package org.openapitools.client.auth;
+
+import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.List;
+
+import org.openapitools.client.Pair;
+import org.junit.*;
+import static org.junit.Assert.*;
+
+
+public class HttpBasicAuthTest {
+    HttpBasicAuth auth = null;
+
+    @Before
+    public void setup() {
+        auth = new HttpBasicAuth();
+    }
+
+    @Test
+    public void testApplyToParams() {
+        List<Pair> queryParams = new ArrayList<Pair>();
+        Map<String, String> headerParams = new HashMap<String, String>();
+
+        auth.setUsername("my-username");
+        auth.setPassword("my-password");
+        auth.applyToParams(queryParams, headerParams);
+
+        // no changes to query parameters
+        assertEquals(0, queryParams.size());
+        assertEquals(1, headerParams.size());
+        // the string below is base64-encoded result of "my-username:my-password" with the "Basic " prefix
+        String expected = "Basic bXktdXNlcm5hbWU6bXktcGFzc3dvcmQ=";
+        assertEquals(expected, headerParams.get("Authorization"));
+
+        // null username should be treated as empty string
+        auth.setUsername(null);
+        auth.applyToParams(queryParams, headerParams);
+        // the string below is base64-encoded result of ":my-password" with the "Basic " prefix
+        expected = "Basic Om15LXBhc3N3b3Jk";
+        assertEquals(expected, headerParams.get("Authorization"));
+
+        // null password should be treated as empty string
+        auth.setUsername("my-username");
+        auth.setPassword(null);
+        auth.applyToParams(queryParams, headerParams);
+        // the string below is base64-encoded result of "my-username:" with the "Basic " prefix
+        expected = "Basic bXktdXNlcm5hbWU6";
+        assertEquals(expected, headerParams.get("Authorization"));
+    }
+}

samples/client/petstore/java/jersey2-java8/src/test/java/org/openapitools/client/model/EnumValueTest.java

@@ -0,0 +1,63 @@
+package org.openapitools.client.model;
+
+import org.junit.Test;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectWriter;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+public class EnumValueTest {
+
+    @Test
+    public void testEnumClass() {
+        assertEquals(EnumClass._ABC.toString(), "_abc");
+        assertEquals(EnumClass._EFG.toString(), "-efg");
+        assertEquals(EnumClass._XYZ_.toString(), "(xyz)");
+    }
+
+    @Test
+    public void testEnumTest() {
+        // test enum value
+        EnumTest enumTest = new EnumTest();
+        enumTest.setEnumString(EnumTest.EnumStringEnum.LOWER);
+        enumTest.setEnumInteger(EnumTest.EnumIntegerEnum.NUMBER_1);
+        enumTest.setEnumNumber(EnumTest.EnumNumberEnum.NUMBER_1_DOT_1);
+
+        assertEquals(EnumTest.EnumStringEnum.UPPER.toString(), "UPPER");
+        assertEquals(EnumTest.EnumStringEnum.UPPER.getValue(), "UPPER");
+        assertEquals(EnumTest.EnumStringEnum.LOWER.toString(), "lower");
+        assertEquals(EnumTest.EnumStringEnum.LOWER.getValue(), "lower");
+
+        assertEquals(EnumTest.EnumIntegerEnum.NUMBER_1.toString(), "1");
+        assertTrue(EnumTest.EnumIntegerEnum.NUMBER_1.getValue() == 1);
+        assertEquals(EnumTest.EnumIntegerEnum.NUMBER_MINUS_1.toString(), "-1");
+        assertTrue(EnumTest.EnumIntegerEnum.NUMBER_MINUS_1.getValue() == -1);
+
+        assertEquals(EnumTest.EnumNumberEnum.NUMBER_1_DOT_1.toString(), "1.1");
+        assertTrue(EnumTest.EnumNumberEnum.NUMBER_1_DOT_1.getValue() == 1.1);
+        assertEquals(EnumTest.EnumNumberEnum.NUMBER_MINUS_1_DOT_2.toString(), "-1.2");
+        assertTrue(EnumTest.EnumNumberEnum.NUMBER_MINUS_1_DOT_2.getValue() == -1.2);
+
+        try {
+            // test serialization (object => json)
+            ObjectMapper mapper = new ObjectMapper();
+            mapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
+            ObjectWriter ow = mapper.writer();
+            String json = ow.writeValueAsString(enumTest);
+            assertEquals(json, "{\"enum_string\":\"lower\",\"enum_string_required\":null,\"enum_integer\":1,\"enum_number\":1.1,\"outerEnum\":null}");
+
+            // test deserialization (json => object)
+            EnumTest fromString = mapper.readValue(json, EnumTest.class);
+            assertEquals(fromString.getEnumString().toString(), "lower");
+            assertEquals(fromString.getEnumInteger().toString(), "1");
+            assertEquals(fromString.getEnumNumber().toString(), "1.1");
+
+        } catch (Exception e) {
+            fail("Exception thrown during serialization/deserialzation of JSON: " + e.getMessage());
+        }
+    }
+}

samples/client/petstore/java/jersey2/docs/MapTest.md

@@ -6,6 +6,8 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **mapMapOfString** | [**Map<String, Map<String, String>>**](Map.md) |  |  [optional]
 **mapOfEnumString** | [**Map<String, InnerEnum>**](#Map<String, InnerEnum>) |  |  [optional]
+**directMap** | **Map<String, Boolean>** |  |  [optional]
+**indirectMap** | [**StringBooleanMap**](StringBooleanMap.md) |  |  [optional]
 
 
 <a name="Map<String, InnerEnum>"></a>

samples/client/petstore/java/jersey2/docs/StringBooleanMap.md

@@ -0,0 +1,9 @@
+
+# StringBooleanMap
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+
+

samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/MapTest.java

@@ -23,6 +23,7 @@ import io.swagger.annotations.ApiModelProperty;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.openapitools.client.model.StringBooleanMap;
 
 /**
  * MapTest
@@ -70,6 +71,12 @@ public class MapTest {
   @JsonProperty("map_of_enum_string")
   private Map<String, InnerEnum> mapOfEnumString = null;
 
+  @JsonProperty("direct_map")
+  private Map<String, Boolean> directMap = null;
+
+  @JsonProperty("indirect_map")
+  private StringBooleanMap indirectMap = null;
+
   public MapTest mapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
     this.mapMapOfString = mapMapOfString;
     return this;
@@ -122,6 +129,50 @@ public class MapTest {
     this.mapOfEnumString = mapOfEnumString;
   }
 
+  public MapTest directMap(Map<String, Boolean> directMap) {
+    this.directMap = directMap;
+    return this;
+  }
+
+  public MapTest putDirectMapItem(String key, Boolean directMapItem) {
+    if (this.directMap == null) {
+      this.directMap = new HashMap<String, Boolean>();
+    }
+    this.directMap.put(key, directMapItem);
+    return this;
+  }
+
+   /**
+   * Get directMap
+   * @return directMap
+  **/
+  @ApiModelProperty(value = "")
+  public Map<String, Boolean> getDirectMap() {
+    return directMap;
+  }
+
+  public void setDirectMap(Map<String, Boolean> directMap) {
+    this.directMap = directMap;
+  }
+
+  public MapTest indirectMap(StringBooleanMap indirectMap) {
+    this.indirectMap = indirectMap;
+    return this;
+  }
+
+   /**
+   * Get indirectMap
+   * @return indirectMap
+  **/
+  @ApiModelProperty(value = "")
+  public StringBooleanMap getIndirectMap() {
+    return indirectMap;
+  }
+
+  public void setIndirectMap(StringBooleanMap indirectMap) {
+    this.indirectMap = indirectMap;
+  }
+
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -133,12 +184,14 @@ public class MapTest {
     }
     MapTest mapTest = (MapTest) o;
     return Objects.equals(this.mapMapOfString, mapTest.mapMapOfString) &&
-        Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString);
+        Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString) &&
+        Objects.equals(this.directMap, mapTest.directMap) &&
+        Objects.equals(this.indirectMap, mapTest.indirectMap);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(mapMapOfString, mapOfEnumString);
+    return Objects.hash(mapMapOfString, mapOfEnumString, directMap, indirectMap);
   }
 
 
@@ -149,6 +202,8 @@ public class MapTest {
     
     sb.append("    mapMapOfString: ").append(toIndentedString(mapMapOfString)).append("\n");
     sb.append("    mapOfEnumString: ").append(toIndentedString(mapOfEnumString)).append("\n");
+    sb.append("    directMap: ").append(toIndentedString(directMap)).append("\n");
+    sb.append("    indirectMap: ").append(toIndentedString(indirectMap)).append("\n");
     sb.append("}");
     return sb.toString();
   }

samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/OuterComposite.java

@@ -82,7 +82,7 @@ public class OuterComposite {
    * @return myBoolean
   **/
   @ApiModelProperty(value = "")
-  public Boolean getMyBoolean() {
+  public Boolean isMyBoolean() {
     return myBoolean;
   }
 

samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/StringBooleanMap.java

@@ -0,0 +1,65 @@
+/*
+ * OpenAPI 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
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * StringBooleanMap
+ */
+
+public class StringBooleanMap extends HashMap<String, Boolean> {
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    return super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class StringBooleanMap {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).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/jersey2/src/test/java/org/openapitools/client/ApiClientTest.java

@@ -0,0 +1,250 @@
+package org.openapitools.client;
+
+import org.openapitools.client.auth.*;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+import org.junit.*;
+import static org.junit.Assert.*;
+
+
+public class ApiClientTest {
+    ApiClient apiClient = null;
+
+    @Before
+    public void setup() {
+        apiClient = new ApiClient();
+    }
+
+    @Test
+    public void testParseAndFormatDate() {
+        // default date format
+        String dateStr = "2015-11-07T03:49:09.356Z";
+        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T03:49:09.356+00:00")));
+        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T03:49:09.356Z")));
+        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T05:49:09.356+02:00")));
+        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T02:49:09.356-01:00")));
+
+        // custom date format: without milli-seconds, custom time zone
+        DateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
+        format.setTimeZone(TimeZone.getTimeZone("GMT+10"));
+        apiClient.setDateFormat(format);
+        dateStr = "2015-11-07T13:49:09+10:00";
+        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T03:49:09+00:00")));
+        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T03:49:09Z")));
+        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T00:49:09-03:00")));
+        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T13:49:09+10:00")));
+    }
+
+    @Test
+    public void testIsJsonMime() {
+        assertFalse(apiClient.isJsonMime(null));
+        assertFalse(apiClient.isJsonMime(""));
+        assertFalse(apiClient.isJsonMime("text/plain"));
+        assertFalse(apiClient.isJsonMime("application/xml"));
+        assertFalse(apiClient.isJsonMime("application/jsonp"));
+        assertFalse(apiClient.isJsonMime("example/json"));
+        assertFalse(apiClient.isJsonMime("example/foo+bar+jsonx"));
+        assertFalse(apiClient.isJsonMime("example/foo+bar+xjson"));
+
+        assertTrue(apiClient.isJsonMime("application/json"));
+        assertTrue(apiClient.isJsonMime("application/json; charset=UTF8"));
+        assertTrue(apiClient.isJsonMime("APPLICATION/JSON"));
+
+        assertTrue(apiClient.isJsonMime("application/problem+json"));
+        assertTrue(apiClient.isJsonMime("APPLICATION/PROBLEM+JSON"));
+        assertTrue(apiClient.isJsonMime("application/json\t"));
+        assertTrue(apiClient.isJsonMime("example/foo+bar+json"));
+        assertTrue(apiClient.isJsonMime("example/foo+json;x;y"));
+        assertTrue(apiClient.isJsonMime("example/foo+json\t;"));
+        assertTrue(apiClient.isJsonMime("Example/fOO+JSON"));
+    }
+
+    @Test
+    public void testSelectHeaderAccept() {
+        String[] accepts = {"application/json", "application/xml"};
+        assertEquals("application/json", apiClient.selectHeaderAccept(accepts));
+
+        accepts = new String[]{"APPLICATION/XML", "APPLICATION/JSON"};
+        assertEquals("APPLICATION/JSON", apiClient.selectHeaderAccept(accepts));
+
+        accepts = new String[]{"application/xml", "application/json; charset=UTF8"};
+        assertEquals("application/json; charset=UTF8", apiClient.selectHeaderAccept(accepts));
+
+        accepts = new String[]{"text/plain", "application/xml"};
+        assertEquals("text/plain,application/xml", apiClient.selectHeaderAccept(accepts));
+
+        accepts = new String[]{};
+        assertNull(apiClient.selectHeaderAccept(accepts));
+    }
+
+    @Test
+    public void testSelectHeaderContentType() {
+        String[] contentTypes = {"application/json", "application/xml"};
+        assertEquals("application/json", apiClient.selectHeaderContentType(contentTypes));
+
+        contentTypes = new String[]{"APPLICATION/JSON", "APPLICATION/XML"};
+        assertEquals("APPLICATION/JSON", apiClient.selectHeaderContentType(contentTypes));
+
+        contentTypes = new String[]{"application/xml", "application/json; charset=UTF8"};
+        assertEquals("application/json; charset=UTF8", apiClient.selectHeaderContentType(contentTypes));
+
+        contentTypes = new String[]{"text/plain", "application/xml"};
+        assertEquals("text/plain", apiClient.selectHeaderContentType(contentTypes));
+
+        contentTypes = new String[]{};
+        assertEquals("application/json", apiClient.selectHeaderContentType(contentTypes));
+    }
+
+    @Test
+    public void testGetAuthentications() {
+        Map<String, Authentication> auths = apiClient.getAuthentications();
+
+        Authentication auth = auths.get("api_key");
+        assertNotNull(auth);
+        assertTrue(auth instanceof ApiKeyAuth);
+        ApiKeyAuth apiKeyAuth = (ApiKeyAuth) auth;
+        assertEquals("header", apiKeyAuth.getLocation());
+        assertEquals("api_key", apiKeyAuth.getParamName());
+
+        auth = auths.get("petstore_auth");
+        assertTrue(auth instanceof OAuth);
+        assertSame(auth, apiClient.getAuthentication("petstore_auth"));
+
+        assertNull(auths.get("unknown"));
+
+        try {
+            auths.put("my_auth", new HttpBasicAuth());
+            fail("the authentications returned should not be modifiable");
+        } catch (UnsupportedOperationException e) {
+        }
+    }
+
+    @Ignore("There is no more basic auth in petstore security definitions")
+    @Test
+    public void testSetUsernameAndPassword() {
+        HttpBasicAuth auth = null;
+        for (Authentication _auth : apiClient.getAuthentications().values()) {
+            if (_auth instanceof HttpBasicAuth) {
+                auth = (HttpBasicAuth) _auth;
+                break;
+            }
+        }
+        auth.setUsername(null);
+        auth.setPassword(null);
+
+        apiClient.setUsername("my-username");
+        apiClient.setPassword("my-password");
+        assertEquals("my-username", auth.getUsername());
+        assertEquals("my-password", auth.getPassword());
+
+        // reset values
+        auth.setUsername(null);
+        auth.setPassword(null);
+    }
+
+    @Test
+    public void testSetApiKeyAndPrefix() {
+        ApiKeyAuth auth = null;
+        for (Authentication _auth : apiClient.getAuthentications().values()) {
+            if (_auth instanceof ApiKeyAuth) {
+                auth = (ApiKeyAuth) _auth;
+                break;
+            }
+        }
+        auth.setApiKey(null);
+        auth.setApiKeyPrefix(null);
+
+        apiClient.setApiKey("my-api-key");
+        apiClient.setApiKeyPrefix("Token");
+        assertEquals("my-api-key", auth.getApiKey());
+        assertEquals("Token", auth.getApiKeyPrefix());
+
+        // reset values
+        auth.setApiKey(null);
+        auth.setApiKeyPrefix(null);
+    }
+
+    @Test
+    public void testParameterToPairsWhenNameIsInvalid() throws Exception {
+        List<Pair> pairs_a = apiClient.parameterToPairs("csv", null, new Integer(1));
+        List<Pair> pairs_b = apiClient.parameterToPairs("csv", "", new Integer(1));
+
+        assertTrue(pairs_a.isEmpty());
+        assertTrue(pairs_b.isEmpty());
+    }
+
+    @Test
+    public void testParameterToPairsWhenValueIsNull() throws Exception {
+        List<Pair> pairs = apiClient.parameterToPairs("csv", "param-a", null);
+
+        assertTrue(pairs.isEmpty());
+    }
+
+    @Test
+    public void testParameterToPairsWhenValueIsEmptyStrings() throws Exception {
+
+        // single empty string
+        List<Pair> pairs = apiClient.parameterToPairs("csv", "param-a", " ");
+        assertEquals(1, pairs.size());
+
+        // list of empty strings
+        List<String> strs = new ArrayList<String>();
+        strs.add(" ");
+        strs.add(" ");
+        strs.add(" ");
+
+        List<Pair> concatStrings = apiClient.parameterToPairs("csv", "param-a", strs);
+
+        assertEquals(1, concatStrings.size());
+        assertFalse(concatStrings.get(0).getValue().isEmpty()); // should contain some delimiters
+    }
+
+    @Test
+    public void testParameterToPairsWhenValueIsNotCollection() throws Exception {
+        String name = "param-a";
+        Integer value = 1;
+
+        List<Pair> pairs = apiClient.parameterToPairs("csv", name, value);
+
+        assertEquals(1, pairs.size());
+        assertEquals(value, Integer.valueOf(pairs.get(0).getValue()));
+    }
+
+    @Test
+    public void testParameterToPairsWhenValueIsCollection() throws Exception {
+        Map<String, String> collectionFormatMap = new HashMap<String, String>();
+        collectionFormatMap.put("csv", ",");
+        collectionFormatMap.put("tsv", "\t");
+        collectionFormatMap.put("ssv", " ");
+        collectionFormatMap.put("pipes", "\\|");
+        collectionFormatMap.put("", ","); // no format, must default to csv
+        collectionFormatMap.put("unknown", ","); // all other formats, must default to csv
+
+        String name = "param-a";
+
+        List<Object> values = new ArrayList<Object>();
+        values.add("value-a");
+        values.add(123);
+        values.add(new Date());
+
+        // check for multi separately
+        List<Pair> multiPairs = apiClient.parameterToPairs("multi", name, values);
+        assertEquals(values.size(), multiPairs.size());
+
+        // all other formats
+        for (String collectionFormat : collectionFormatMap.keySet()) {
+            List<Pair> pairs = apiClient.parameterToPairs(collectionFormat, name, values);
+
+            assertEquals(1, pairs.size());
+
+            String delimiter = collectionFormatMap.get(collectionFormat);
+            String[] pairValueSplit = pairs.get(0).getValue().split(delimiter);
+
+            // must equal input values
+            assertEquals(values.size(), pairValueSplit.length);
+        }
+    }
+}

samples/client/petstore/java/jersey2/src/test/java/org/openapitools/client/ConfigurationTest.java

@@ -0,0 +1,15 @@
+package org.openapitools.client;
+
+import org.junit.*;
+import static org.junit.Assert.*;
+
+
+public class ConfigurationTest {
+    @Test
+    public void testDefaultApiClient() {
+        ApiClient apiClient = Configuration.getDefaultApiClient();
+        assertNotNull(apiClient);
+        assertEquals("http://petstore.swagger.io:80/v2", apiClient.getBasePath());
+        assertFalse(apiClient.isDebugging());
+    }
+}

samples/client/petstore/java/jersey2/src/test/java/org/openapitools/client/JSONTest.java

@@ -0,0 +1,58 @@
+package org.openapitools.client;
+
+import org.openapitools.client.model.Order;
+import org.junit.Before;
+import org.junit.Test;
+import org.threeten.bp.OffsetDateTime;
+import org.threeten.bp.ZoneId;
+import org.threeten.bp.format.DateTimeFormatter;
+
+import static org.junit.Assert.*;
+
+
+public class JSONTest {
+    private JSON json = null;
+    private Order order = null;
+
+    @Before
+    public void setup() {
+        json = new ApiClient().getJSON();
+        order = new Order();
+    }
+
+    @Test
+    public void testDefaultDate() throws Exception {
+        final DateTimeFormatter dateFormat = DateTimeFormatter.ISO_OFFSET_DATE_TIME;
+        final String dateStr = "2015-11-07T14:11:05.267Z";
+        order.setShipDate(dateFormat.parse(dateStr, OffsetDateTime.FROM));
+
+        String str = json.getContext(null).writeValueAsString(order);
+        Order o = json.getContext(null).readValue(str, Order.class);
+        assertEquals(dateStr, dateFormat.format(o.getShipDate()));
+    }
+
+    @Test
+    public void testCustomDate() throws Exception {
+        final DateTimeFormatter dateFormat = DateTimeFormatter.ISO_OFFSET_DATE_TIME.withZone(ZoneId.of("Etc/GMT+2"));
+        final String dateStr = "2015-11-07T14:11:05-02:00";
+        order.setShipDate(dateFormat.parse(dateStr, OffsetDateTime.FROM));
+
+        String str = json.getContext(null).writeValueAsString(order);
+        Order o = json.getContext(null).readValue(str, Order.class);
+        assertEquals(dateStr, dateFormat.format(o.getShipDate()));
+    }
+
+    @Test
+    public void testSqlDateSerialization() throws Exception {
+        String str = json.getContext(null).writeValueAsString(new java.sql.Date(10));
+        assertEquals("\"1970-01-01\"", str);
+    }
+
+    @Test
+    public void testSqlDateDeserialization() throws Exception {
+        final String str = "1970-01-01";
+        java.sql.Date date = json.getContext(null).readValue("\"" + str + "\"", java.sql.Date.class);
+        assertEquals(date.toString(), str);
+    }
+
+}

samples/client/petstore/java/jersey2/src/test/java/org/openapitools/client/StringUtilTest.java

@@ -0,0 +1,33 @@
+package org.openapitools.client;
+
+import org.junit.*;
+import static org.junit.Assert.*;
+
+
+public class StringUtilTest {
+    @Test
+    public void testContainsIgnoreCase() {
+        assertTrue(StringUtil.containsIgnoreCase(new String[]{"abc"}, "abc"));
+        assertTrue(StringUtil.containsIgnoreCase(new String[]{"abc"}, "ABC"));
+        assertTrue(StringUtil.containsIgnoreCase(new String[]{"ABC"}, "abc"));
+        assertTrue(StringUtil.containsIgnoreCase(new String[]{null, "abc"}, "ABC"));
+        assertTrue(StringUtil.containsIgnoreCase(new String[]{null, "abc"}, null));
+
+        assertFalse(StringUtil.containsIgnoreCase(new String[]{"abc"}, "def"));
+        assertFalse(StringUtil.containsIgnoreCase(new String[]{}, "ABC"));
+        assertFalse(StringUtil.containsIgnoreCase(new String[]{}, null));
+    }
+
+    @Test
+    public void testJoin() {
+        String[] array = {"aa", "bb", "cc"};
+        assertEquals("aa,bb,cc", StringUtil.join(array, ","));
+        assertEquals("aa, bb, cc", StringUtil.join(array, ", "));
+        assertEquals("aabbcc", StringUtil.join(array, ""));
+        assertEquals("aa bb cc", StringUtil.join(array, " "));
+        assertEquals("aa\nbb\ncc", StringUtil.join(array, "\n"));
+
+        assertEquals("", StringUtil.join(new String[]{}, ","));
+        assertEquals("abc", StringUtil.join(new String[]{"abc"}, ","));
+    }
+}

samples/client/petstore/java/jersey2/src/test/java/org/openapitools/client/auth/ApiKeyAuthTest.java

@@ -0,0 +1,47 @@
+package org.openapitools.client.auth;
+
+import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.List;
+
+import org.openapitools.client.Pair;
+import org.junit.*;
+import static org.junit.Assert.*;
+
+
+public class ApiKeyAuthTest {
+    @Test
+    public void testApplyToParamsInQuery() {
+        List<Pair> queryParams = new ArrayList<Pair>();
+        Map<String, String> headerParams = new HashMap<String, String>();
+
+        ApiKeyAuth auth = new ApiKeyAuth("query", "api_key");
+        auth.setApiKey("my-api-key");
+        auth.applyToParams(queryParams, headerParams);
+
+        assertEquals(1, queryParams.size());
+        for (Pair queryParam : queryParams) {
+            assertEquals("my-api-key", queryParam.getValue());
+        }
+
+        // no changes to header parameters
+        assertEquals(0, headerParams.size());
+    }
+
+    @Test
+    public void testApplyToParamsInHeaderWithPrefix() {
+            List<Pair> queryParams = new ArrayList<Pair>();
+        Map<String, String> headerParams = new HashMap<String, String>();
+
+        ApiKeyAuth auth = new ApiKeyAuth("header", "X-API-TOKEN");
+        auth.setApiKey("my-api-token");
+        auth.setApiKeyPrefix("Token");
+        auth.applyToParams(queryParams, headerParams);
+
+        // no changes to query parameters
+        assertEquals(0, queryParams.size());
+        assertEquals(1, headerParams.size());
+        assertEquals("Token my-api-token", headerParams.get("X-API-TOKEN"));
+    }
+}

samples/client/petstore/java/jersey2/src/test/java/org/openapitools/client/auth/HttpBasicAuthTest.java

@@ -0,0 +1,52 @@
+package org.openapitools.client.auth;
+
+import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.List;
+
+import org.openapitools.client.Pair;
+import org.junit.*;
+import static org.junit.Assert.*;
+
+
+public class HttpBasicAuthTest {
+    HttpBasicAuth auth = null;
+
+    @Before
+    public void setup() {
+        auth = new HttpBasicAuth();
+    }
+
+    @Test
+    public void testApplyToParams() {
+        List<Pair> queryParams = new ArrayList<Pair>();
+        Map<String, String> headerParams = new HashMap<String, String>();
+
+        auth.setUsername("my-username");
+        auth.setPassword("my-password");
+        auth.applyToParams(queryParams, headerParams);
+
+        // no changes to query parameters
+        assertEquals(0, queryParams.size());
+        assertEquals(1, headerParams.size());
+        // the string below is base64-encoded result of "my-username:my-password" with the "Basic " prefix
+        String expected = "Basic bXktdXNlcm5hbWU6bXktcGFzc3dvcmQ=";
+        assertEquals(expected, headerParams.get("Authorization"));
+
+        // null username should be treated as empty string
+        auth.setUsername(null);
+        auth.applyToParams(queryParams, headerParams);
+        // the string below is base64-encoded result of ":my-password" with the "Basic " prefix
+        expected = "Basic Om15LXBhc3N3b3Jk";
+        assertEquals(expected, headerParams.get("Authorization"));
+
+        // null password should be treated as empty string
+        auth.setUsername("my-username");
+        auth.setPassword(null);
+        auth.applyToParams(queryParams, headerParams);
+        // the string below is base64-encoded result of "my-username:" with the "Basic " prefix
+        expected = "Basic bXktdXNlcm5hbWU6";
+        assertEquals(expected, headerParams.get("Authorization"));
+    }
+}

samples/client/petstore/java/jersey2/src/test/java/org/openapitools/client/model/EnumValueTest.java

@@ -0,0 +1,63 @@
+package org.openapitools.client.model;
+
+import org.junit.Test;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectWriter;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+public class EnumValueTest {
+
+    @Test
+    public void testEnumClass() {
+        assertEquals(EnumClass._ABC.toString(), "_abc");
+        assertEquals(EnumClass._EFG.toString(), "-efg");
+        assertEquals(EnumClass._XYZ_.toString(), "(xyz)");
+    }
+
+    @Test
+    public void testEnumTest() {
+        // test enum value
+        EnumTest enumTest = new EnumTest();
+        enumTest.setEnumString(EnumTest.EnumStringEnum.LOWER);
+        enumTest.setEnumInteger(EnumTest.EnumIntegerEnum.NUMBER_1);
+        enumTest.setEnumNumber(EnumTest.EnumNumberEnum.NUMBER_1_DOT_1);
+
+        assertEquals(EnumTest.EnumStringEnum.UPPER.toString(), "UPPER");
+        assertEquals(EnumTest.EnumStringEnum.UPPER.getValue(), "UPPER");
+        assertEquals(EnumTest.EnumStringEnum.LOWER.toString(), "lower");
+        assertEquals(EnumTest.EnumStringEnum.LOWER.getValue(), "lower");
+
+        assertEquals(EnumTest.EnumIntegerEnum.NUMBER_1.toString(), "1");
+        assertTrue(EnumTest.EnumIntegerEnum.NUMBER_1.getValue() == 1);
+        assertEquals(EnumTest.EnumIntegerEnum.NUMBER_MINUS_1.toString(), "-1");
+        assertTrue(EnumTest.EnumIntegerEnum.NUMBER_MINUS_1.getValue() == -1);
+
+        assertEquals(EnumTest.EnumNumberEnum.NUMBER_1_DOT_1.toString(), "1.1");
+        assertTrue(EnumTest.EnumNumberEnum.NUMBER_1_DOT_1.getValue() == 1.1);
+        assertEquals(EnumTest.EnumNumberEnum.NUMBER_MINUS_1_DOT_2.toString(), "-1.2");
+        assertTrue(EnumTest.EnumNumberEnum.NUMBER_MINUS_1_DOT_2.getValue() == -1.2);
+
+        try {
+            // test serialization (object => json)
+            ObjectMapper mapper = new ObjectMapper();
+            mapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
+            ObjectWriter ow = mapper.writer();
+            String json = ow.writeValueAsString(enumTest);
+            assertEquals(json, "{\"enum_string\":\"lower\",\"enum_string_required\":null,\"enum_integer\":1,\"enum_number\":1.1,\"outerEnum\":null}");
+
+            // test deserialization (json => object)
+            EnumTest fromString = mapper.readValue(json, EnumTest.class);
+            assertEquals(fromString.getEnumString().toString(), "lower");
+            assertEquals(fromString.getEnumInteger().toString(), "1");
+            assertEquals(fromString.getEnumNumber().toString(), "1.1");
+
+        } catch (Exception e) {
+            fail("Exception thrown during serialization/deserialzation of JSON: " + e.getMessage());
+        }
+    }
+}

samples/client/petstore/java/okhttp-gson-parcelableModel/docs/MapTest.md

@@ -6,6 +6,8 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **mapMapOfString** | [**Map<String, Map<String, String>>**](Map.md) |  |  [optional]
 **mapOfEnumString** | [**Map<String, InnerEnum>**](#Map<String, InnerEnum>) |  |  [optional]
+**directMap** | **Map<String, Boolean>** |  |  [optional]
+**indirectMap** | [**StringBooleanMap**](StringBooleanMap.md) |  |  [optional]
 
 
 <a name="Map<String, InnerEnum>"></a>

samples/client/petstore/java/okhttp-gson-parcelableModel/docs/StringBooleanMap.md

@@ -0,0 +1,9 @@
+
+# StringBooleanMap
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+
+

samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/ApiClient.java

@@ -897,7 +897,7 @@ public class ApiClient {
      * @param <T> Type
      * @param response Response
      * @param returnType Return type
-     * @throws ApiException If the response has a unsuccessful status code or
+     * @throws ApiException If the response has an unsuccessful status code or
      *   fail to deserialize the response body
      * @return Type
      */

samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MapTest.java

@@ -26,6 +26,7 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.openapitools.client.model.StringBooleanMap;
 import android.os.Parcelable;
 import android.os.Parcel;
 
@@ -89,6 +90,14 @@ public class MapTest implements Parcelable {
   @SerializedName(SERIALIZED_NAME_MAP_OF_ENUM_STRING)
   private Map<String, InnerEnum> mapOfEnumString = null;
 
+  public static final String SERIALIZED_NAME_DIRECT_MAP = "direct_map";
+  @SerializedName(SERIALIZED_NAME_DIRECT_MAP)
+  private Map<String, Boolean> directMap = null;
+
+  public static final String SERIALIZED_NAME_INDIRECT_MAP = "indirect_map";
+  @SerializedName(SERIALIZED_NAME_INDIRECT_MAP)
+  private StringBooleanMap indirectMap = null;
+
   public MapTest() {
   }
   public MapTest mapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
@@ -143,6 +152,50 @@ public class MapTest implements Parcelable {
     this.mapOfEnumString = mapOfEnumString;
   }
 
+  public MapTest directMap(Map<String, Boolean> directMap) {
+    this.directMap = directMap;
+    return this;
+  }
+
+  public MapTest putDirectMapItem(String key, Boolean directMapItem) {
+    if (this.directMap == null) {
+      this.directMap = new HashMap<String, Boolean>();
+    }
+    this.directMap.put(key, directMapItem);
+    return this;
+  }
+
+   /**
+   * Get directMap
+   * @return directMap
+  **/
+  @ApiModelProperty(value = "")
+  public Map<String, Boolean> getDirectMap() {
+    return directMap;
+  }
+
+  public void setDirectMap(Map<String, Boolean> directMap) {
+    this.directMap = directMap;
+  }
+
+  public MapTest indirectMap(StringBooleanMap indirectMap) {
+    this.indirectMap = indirectMap;
+    return this;
+  }
+
+   /**
+   * Get indirectMap
+   * @return indirectMap
+  **/
+  @ApiModelProperty(value = "")
+  public StringBooleanMap getIndirectMap() {
+    return indirectMap;
+  }
+
+  public void setIndirectMap(StringBooleanMap indirectMap) {
+    this.indirectMap = indirectMap;
+  }
+
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -154,12 +207,14 @@ public class MapTest implements Parcelable {
     }
     MapTest mapTest = (MapTest) o;
     return Objects.equals(this.mapMapOfString, mapTest.mapMapOfString) &&
-        Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString);
+        Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString) &&
+        Objects.equals(this.directMap, mapTest.directMap) &&
+        Objects.equals(this.indirectMap, mapTest.indirectMap);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(mapMapOfString, mapOfEnumString);
+    return Objects.hash(mapMapOfString, mapOfEnumString, directMap, indirectMap);
   }
 
 
@@ -170,6 +225,8 @@ public class MapTest implements Parcelable {
     
     sb.append("    mapMapOfString: ").append(toIndentedString(mapMapOfString)).append("\n");
     sb.append("    mapOfEnumString: ").append(toIndentedString(mapOfEnumString)).append("\n");
+    sb.append("    directMap: ").append(toIndentedString(directMap)).append("\n");
+    sb.append("    indirectMap: ").append(toIndentedString(indirectMap)).append("\n");
     sb.append("}");
     return sb.toString();
   }
@@ -189,11 +246,15 @@ public class MapTest implements Parcelable {
   public void writeToParcel(Parcel out, int flags) {
     out.writeValue(mapMapOfString);
     out.writeValue(mapOfEnumString);
+    out.writeValue(directMap);
+    out.writeValue(indirectMap);
   }
 
   MapTest(Parcel in) {
     mapMapOfString = (Map<String, Map<String, String>>)in.readValue(Map.class.getClassLoader());
     mapOfEnumString = (Map<String, InnerEnum>)in.readValue(null);
+    directMap = (Map<String, Boolean>)in.readValue(null);
+    indirectMap = (StringBooleanMap)in.readValue(StringBooleanMap.class.getClassLoader());
   }
 
   public int describeContents() {

samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/OuterComposite.java

@@ -92,7 +92,7 @@ public class OuterComposite implements Parcelable {
    * @return myBoolean
   **/
   @ApiModelProperty(value = "")
-  public Boolean getMyBoolean() {
+  public Boolean isMyBoolean() {
     return myBoolean;
   }
 

samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/StringBooleanMap.java

@@ -0,0 +1,91 @@
+/*
+ * OpenAPI 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
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import android.os.Parcelable;
+import android.os.Parcel;
+
+/**
+ * StringBooleanMap
+ */
+
+public class StringBooleanMap extends HashMap<String, Boolean> implements Parcelable {
+  public StringBooleanMap() {
+    super();
+  }
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    return super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class StringBooleanMap {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).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    ");
+  }
+
+
+  public void writeToParcel(Parcel out, int flags) {
+    super.writeToParcel(out, flags);
+  }
+
+  StringBooleanMap(Parcel in) {
+    super(in);
+  }
+
+  public int describeContents() {
+    return 0;
+  }
+
+  public static final Parcelable.Creator<StringBooleanMap> CREATOR = new Parcelable.Creator<StringBooleanMap>() {
+    public StringBooleanMap createFromParcel(Parcel in) {
+      return new StringBooleanMap(in);
+    }
+    public StringBooleanMap[] newArray(int size) {
+      return new StringBooleanMap[size];
+    }
+  };
+}
+

samples/client/petstore/java/okhttp-gson/docs/MapTest.md

@@ -6,6 +6,8 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **mapMapOfString** | [**Map<String, Map<String, String>>**](Map.md) |  |  [optional]
 **mapOfEnumString** | [**Map<String, InnerEnum>**](#Map<String, InnerEnum>) |  |  [optional]
+**directMap** | **Map<String, Boolean>** |  |  [optional]
+**indirectMap** | [**StringBooleanMap**](StringBooleanMap.md) |  |  [optional]
 
 
 <a name="Map<String, InnerEnum>"></a>

samples/client/petstore/java/okhttp-gson/docs/StringBooleanMap.md

@@ -0,0 +1,9 @@
+
+# StringBooleanMap
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+
+

samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/ApiClient.java

@@ -897,7 +897,7 @@ public class ApiClient {
      * @param <T> Type
      * @param response Response
      * @param returnType Return type
-     * @throws ApiException If the response has a unsuccessful status code or
+     * @throws ApiException If the response has an unsuccessful status code or
      *   fail to deserialize the response body
      * @return Type
      */

samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MapTest.java

@@ -26,6 +26,7 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.openapitools.client.model.StringBooleanMap;
 
 /**
  * MapTest
@@ -87,6 +88,14 @@ public class MapTest {
   @SerializedName(SERIALIZED_NAME_MAP_OF_ENUM_STRING)
   private Map<String, InnerEnum> mapOfEnumString = null;
 
+  public static final String SERIALIZED_NAME_DIRECT_MAP = "direct_map";
+  @SerializedName(SERIALIZED_NAME_DIRECT_MAP)
+  private Map<String, Boolean> directMap = null;
+
+  public static final String SERIALIZED_NAME_INDIRECT_MAP = "indirect_map";
+  @SerializedName(SERIALIZED_NAME_INDIRECT_MAP)
+  private StringBooleanMap indirectMap = null;
+
   public MapTest mapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
     this.mapMapOfString = mapMapOfString;
     return this;
@@ -139,6 +148,50 @@ public class MapTest {
     this.mapOfEnumString = mapOfEnumString;
   }
 
+  public MapTest directMap(Map<String, Boolean> directMap) {
+    this.directMap = directMap;
+    return this;
+  }
+
+  public MapTest putDirectMapItem(String key, Boolean directMapItem) {
+    if (this.directMap == null) {
+      this.directMap = new HashMap<String, Boolean>();
+    }
+    this.directMap.put(key, directMapItem);
+    return this;
+  }
+
+   /**
+   * Get directMap
+   * @return directMap
+  **/
+  @ApiModelProperty(value = "")
+  public Map<String, Boolean> getDirectMap() {
+    return directMap;
+  }
+
+  public void setDirectMap(Map<String, Boolean> directMap) {
+    this.directMap = directMap;
+  }
+
+  public MapTest indirectMap(StringBooleanMap indirectMap) {
+    this.indirectMap = indirectMap;
+    return this;
+  }
+
+   /**
+   * Get indirectMap
+   * @return indirectMap
+  **/
+  @ApiModelProperty(value = "")
+  public StringBooleanMap getIndirectMap() {
+    return indirectMap;
+  }
+
+  public void setIndirectMap(StringBooleanMap indirectMap) {
+    this.indirectMap = indirectMap;
+  }
+
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -150,12 +203,14 @@ public class MapTest {
     }
     MapTest mapTest = (MapTest) o;
     return Objects.equals(this.mapMapOfString, mapTest.mapMapOfString) &&
-        Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString);
+        Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString) &&
+        Objects.equals(this.directMap, mapTest.directMap) &&
+        Objects.equals(this.indirectMap, mapTest.indirectMap);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(mapMapOfString, mapOfEnumString);
+    return Objects.hash(mapMapOfString, mapOfEnumString, directMap, indirectMap);
   }
 
 
@@ -166,6 +221,8 @@ public class MapTest {
     
     sb.append("    mapMapOfString: ").append(toIndentedString(mapMapOfString)).append("\n");
     sb.append("    mapOfEnumString: ").append(toIndentedString(mapOfEnumString)).append("\n");
+    sb.append("    directMap: ").append(toIndentedString(directMap)).append("\n");
+    sb.append("    indirectMap: ").append(toIndentedString(indirectMap)).append("\n");
     sb.append("}");
     return sb.toString();
   }

samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/OuterComposite.java

@@ -88,7 +88,7 @@ public class OuterComposite {
    * @return myBoolean
   **/
   @ApiModelProperty(value = "")
-  public Boolean getMyBoolean() {
+  public Boolean isMyBoolean() {
     return myBoolean;
   }
 

samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/StringBooleanMap.java

@@ -0,0 +1,65 @@
+/*
+ * OpenAPI 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
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * StringBooleanMap
+ */
+
+public class StringBooleanMap extends HashMap<String, Boolean> {
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    return super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class StringBooleanMap {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).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/okhttp-gson/src/test/java/org/openapitools/client/ApiClientTest.java

@@ -0,0 +1,330 @@
+package org.openapitools.client;
+
+import org.openapitools.client.auth.*;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.TimeZone;
+
+import org.junit.*;
+import static org.junit.Assert.*;
+
+
+public class ApiClientTest {
+    ApiClient apiClient;
+    JSON json;
+
+    @Before
+    public void setup() {
+        apiClient = new ApiClient();
+        json = apiClient.getJSON();
+    }
+
+    @Test
+    public void testIsJsonMime() {
+        assertFalse(apiClient.isJsonMime(null));
+        assertFalse(apiClient.isJsonMime(""));
+        assertFalse(apiClient.isJsonMime("text/plain"));
+        assertFalse(apiClient.isJsonMime("application/xml"));
+        assertFalse(apiClient.isJsonMime("application/jsonp"));
+        assertFalse(apiClient.isJsonMime("example/json"));
+        assertFalse(apiClient.isJsonMime("example/foo+bar+jsonx"));
+        assertFalse(apiClient.isJsonMime("example/foo+bar+xjson"));
+
+        assertTrue(apiClient.isJsonMime("application/json"));
+        assertTrue(apiClient.isJsonMime("application/json; charset=UTF8"));
+        assertTrue(apiClient.isJsonMime("APPLICATION/JSON"));
+
+        assertTrue(apiClient.isJsonMime("application/problem+json"));
+        assertTrue(apiClient.isJsonMime("APPLICATION/PROBLEM+JSON"));
+        assertTrue(apiClient.isJsonMime("application/json\t"));
+        assertTrue(apiClient.isJsonMime("example/foo+bar+json"));
+        assertTrue(apiClient.isJsonMime("example/foo+json;x;y"));
+        assertTrue(apiClient.isJsonMime("example/foo+json\t;"));
+        assertTrue(apiClient.isJsonMime("Example/fOO+JSON"));
+
+        assertTrue(apiClient.isJsonMime("application/json-patch+json"));
+    }
+
+    @Test
+    public void testSelectHeaderAccept() {
+        String[] accepts = {"application/json", "application/xml"};
+        assertEquals("application/json", apiClient.selectHeaderAccept(accepts));
+
+        accepts = new String[]{"APPLICATION/XML", "APPLICATION/JSON"};
+        assertEquals("APPLICATION/JSON", apiClient.selectHeaderAccept(accepts));
+
+        accepts = new String[]{"application/xml", "application/json; charset=UTF8"};
+        assertEquals("application/json; charset=UTF8", apiClient.selectHeaderAccept(accepts));
+
+        accepts = new String[]{"text/plain", "application/xml"};
+        assertEquals("text/plain,application/xml", apiClient.selectHeaderAccept(accepts));
+
+        accepts = new String[]{};
+        assertNull(apiClient.selectHeaderAccept(accepts));
+    }
+
+    @Test
+    public void testSelectHeaderContentType() {
+        String[] contentTypes = {"application/json", "application/xml"};
+        assertEquals("application/json", apiClient.selectHeaderContentType(contentTypes));
+
+        contentTypes = new String[]{"APPLICATION/JSON", "APPLICATION/XML"};
+        assertEquals("APPLICATION/JSON", apiClient.selectHeaderContentType(contentTypes));
+
+        contentTypes = new String[]{"application/xml", "application/json; charset=UTF8"};
+        assertEquals("application/json; charset=UTF8", apiClient.selectHeaderContentType(contentTypes));
+
+        contentTypes = new String[]{"text/plain", "application/xml"};
+        assertEquals("text/plain", apiClient.selectHeaderContentType(contentTypes));
+
+        contentTypes = new String[]{};
+        assertEquals("application/json", apiClient.selectHeaderContentType(contentTypes));
+    }
+
+    @Test
+    public void testGetAuthentications() {
+        Map<String, Authentication> auths = apiClient.getAuthentications();
+
+        Authentication auth = auths.get("api_key");
+        assertNotNull(auth);
+        assertTrue(auth instanceof ApiKeyAuth);
+        ApiKeyAuth apiKeyAuth = (ApiKeyAuth) auth;
+        assertEquals("header", apiKeyAuth.getLocation());
+        assertEquals("api_key", apiKeyAuth.getParamName());
+
+        auth = auths.get("petstore_auth");
+        assertTrue(auth instanceof OAuth);
+        assertSame(auth, apiClient.getAuthentication("petstore_auth"));
+
+        assertNull(auths.get("unknown"));
+
+        try {
+            auths.put("my_auth", new HttpBasicAuth());
+            fail("the authentications returned should not be modifiable");
+        } catch (UnsupportedOperationException e) {
+        }
+    }
+
+    /*
+    @Test
+    public void testSetUsernameAndPassword() {
+        HttpBasicAuth auth = null;
+        for (Authentication _auth : apiClient.getAuthentications().values()) {
+            if (_auth instanceof HttpBasicAuth) {
+                auth = (HttpBasicAuth) _auth;
+                break;
+            }
+        }
+        auth.setUsername(null);
+        auth.setPassword(null);
+
+        apiClient.setUsername("my-username");
+        apiClient.setPassword("my-password");
+        assertEquals("my-username", auth.getUsername());
+        assertEquals("my-password", auth.getPassword());
+
+        // reset values
+        auth.setUsername(null);
+        auth.setPassword(null);
+    }
+    */
+
+    @Test
+    public void testSetApiKeyAndPrefix() {
+        ApiKeyAuth auth = null;
+        for (Authentication _auth : apiClient.getAuthentications().values()) {
+            if (_auth instanceof ApiKeyAuth) {
+                auth = (ApiKeyAuth) _auth;
+                break;
+            }
+        }
+        auth.setApiKey(null);
+        auth.setApiKeyPrefix(null);
+
+        apiClient.setApiKey("my-api-key");
+        apiClient.setApiKeyPrefix("Token");
+        assertEquals("my-api-key", auth.getApiKey());
+        assertEquals("Token", auth.getApiKeyPrefix());
+
+        // reset values
+        auth.setApiKey(null);
+        auth.setApiKeyPrefix(null);
+    }
+
+    @Test
+    public void testGetAndSetConnectTimeout() {
+        // connect timeout defaults to 10 seconds
+        assertEquals(10000, apiClient.getConnectTimeout());
+        assertEquals(10000, apiClient.getHttpClient().getConnectTimeout());
+
+        apiClient.setConnectTimeout(0);
+        assertEquals(0, apiClient.getConnectTimeout());
+        assertEquals(0, apiClient.getHttpClient().getConnectTimeout());
+
+        apiClient.setConnectTimeout(10000);
+    }
+    
+    @Test
+    public void testGetAndSetReadTimeout() {
+        // read timeout defaults to 10 seconds
+        assertEquals(10000, apiClient.getReadTimeout());
+        assertEquals(10000, apiClient.getHttpClient().getReadTimeout());
+
+        apiClient.setReadTimeout(0);
+        assertEquals(0, apiClient.getReadTimeout());
+        assertEquals(0, apiClient.getHttpClient().getReadTimeout());
+
+        apiClient.setReadTimeout(10000);
+    }
+    
+    @Test
+    public void testGetAndSetWriteTimeout() {
+        // write timeout defaults to 10 seconds
+        assertEquals(10000, apiClient.getWriteTimeout());
+        assertEquals(10000, apiClient.getHttpClient().getWriteTimeout());
+
+        apiClient.setWriteTimeout(0);
+        assertEquals(0, apiClient.getWriteTimeout());
+        assertEquals(0, apiClient.getHttpClient().getWriteTimeout());
+
+        apiClient.setWriteTimeout(10000);
+    }
+    
+    @Test
+    public void testParameterToPairWhenNameIsInvalid() throws Exception {
+        List<Pair> pairs_a = apiClient.parameterToPair(null, new Integer(1));
+        List<Pair> pairs_b = apiClient.parameterToPair("", new Integer(1));
+
+        assertTrue(pairs_a.isEmpty());
+        assertTrue(pairs_b.isEmpty());
+    }
+
+    @Test
+    public void testParameterToPairWhenValueIsNull() throws Exception {
+        List<Pair> pairs = apiClient.parameterToPair("param-a", null);
+
+        assertTrue(pairs.isEmpty());
+    }
+
+    @Test
+    public void testParameterToPairWhenValueIsEmptyString() throws Exception {
+        // single empty string
+        List<Pair> pairs = apiClient.parameterToPair("param-a", " ");
+        assertEquals(1, pairs.size());
+    }
+
+    @Test
+    public void testParameterToPairWhenValueIsNotCollection() throws Exception {
+        String name = "param-a";
+        Integer value = 1;
+
+        List<Pair> pairs = apiClient.parameterToPair(name, value);
+
+        assertEquals(1, pairs.size());
+        assertEquals(value, Integer.valueOf(pairs.get(0).getValue()));
+    }
+
+    @Test
+    public void testParameterToPairWhenValueIsCollection() throws Exception {
+        List<Object> values = new ArrayList<Object>();
+        values.add("value-a");
+        values.add(123);
+        values.add(new Date());
+
+        List<Pair> pairs = apiClient.parameterToPair("param-a", values);
+        assertEquals(0, pairs.size());
+    }
+
+    @Test
+    public void testParameterToPairsWhenNameIsInvalid() throws Exception {
+        List<Integer> objects = new ArrayList<Integer>();
+        objects.add(new Integer(1));
+
+        List<Pair> pairs_a = apiClient.parameterToPairs("csv", null, objects);
+        List<Pair> pairs_b = apiClient.parameterToPairs("csv", "", objects);
+
+        assertTrue(pairs_a.isEmpty());
+        assertTrue(pairs_b.isEmpty());
+    }
+
+    @Test
+    public void testParameterToPairsWhenValueIsNull() throws Exception {
+        List<Pair> pairs = apiClient.parameterToPairs("csv", "param-a", null);
+
+        assertTrue(pairs.isEmpty());
+    }
+
+    @Test
+    public void testParameterToPairsWhenValueIsEmptyStrings() throws Exception {
+        // list of empty strings
+        List<String> strs = new ArrayList<String>();
+        strs.add(" ");
+        strs.add(" ");
+        strs.add(" ");
+
+        List<Pair> concatStrings = apiClient.parameterToPairs("csv", "param-a", strs);
+
+        assertEquals(1, concatStrings.size());
+        assertFalse(concatStrings.get(0).getValue().isEmpty()); // should contain some delimiters
+    }
+
+    @Test
+    public void testParameterToPairsWhenValueIsCollection() throws Exception {
+        Map<String, String> collectionFormatMap = new HashMap<String, String>();
+        collectionFormatMap.put("csv", ",");
+        collectionFormatMap.put("tsv", "\t");
+        collectionFormatMap.put("ssv", " ");
+        collectionFormatMap.put("pipes", "|");
+        collectionFormatMap.put("", ","); // no format, must default to csv
+        collectionFormatMap.put("unknown", ","); // all other formats, must default to csv
+
+        String name = "param-a";
+
+        List<Object> values = new ArrayList<Object>();
+        values.add("value-a");
+        values.add(123);
+        values.add(new Date());
+
+        // check for multi separately
+        List<Pair> multiPairs = apiClient.parameterToPairs("multi", name, values);
+        assertEquals(values.size(), multiPairs.size());
+        for (int i = 0; i < values.size(); i++) {
+            assertEquals(apiClient.escapeString(apiClient.parameterToString(values.get(i))), multiPairs.get(i).getValue());
+        }
+
+        // all other formats
+        for (String collectionFormat : collectionFormatMap.keySet()) {
+            List<Pair> pairs = apiClient.parameterToPairs(collectionFormat, name, values);
+
+            assertEquals(1, pairs.size());
+
+            String delimiter = collectionFormatMap.get(collectionFormat);
+            if (!delimiter.equals(",")) {
+                // commas are not escaped because they are reserved characters in URIs
+                delimiter = apiClient.escapeString(delimiter);
+            }
+            String[] pairValueSplit = pairs.get(0).getValue().split(delimiter);
+
+            // must equal input values
+            assertEquals(values.size(), pairValueSplit.length);
+            for (int i = 0; i < values.size(); i++) {
+                assertEquals(apiClient.escapeString(apiClient.parameterToString(values.get(i))), pairValueSplit[i]);
+            }
+        }
+    }
+
+    @Test
+    public void testSanitizeFilename() {
+        assertEquals("sun", apiClient.sanitizeFilename("sun"));
+        assertEquals("sun.gif", apiClient.sanitizeFilename("sun.gif"));
+        assertEquals("sun.gif", apiClient.sanitizeFilename("../sun.gif"));
+        assertEquals("sun.gif", apiClient.sanitizeFilename("/var/tmp/sun.gif"));
+        assertEquals("sun.gif", apiClient.sanitizeFilename("./sun.gif"));
+        assertEquals("sun.gif", apiClient.sanitizeFilename("..\\sun.gif"));
+        assertEquals("sun.gif", apiClient.sanitizeFilename("\\var\\tmp\\sun.gif"));
+        assertEquals("sun.gif", apiClient.sanitizeFilename("c:\\var\\tmp\\sun.gif"));
+        assertEquals("sun.gif", apiClient.sanitizeFilename(".\\sun.gif"));
+    }
+}

samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/ConfigurationTest.java

@@ -0,0 +1,15 @@
+package org.openapitools.client;
+
+import org.junit.*;
+import static org.junit.Assert.*;
+
+
+public class ConfigurationTest {
+    @Test
+    public void testDefaultApiClient() {
+        ApiClient apiClient = Configuration.getDefaultApiClient();
+        assertNotNull(apiClient);
+        assertEquals("http://petstore.swagger.io:80/v2", apiClient.getBasePath());
+        assertFalse(apiClient.isDebugging());
+    }
+}

samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/JSONTest.java

@@ -0,0 +1,201 @@
+package org.openapitools.client;
+
+import com.google.gson.reflect.TypeToken;
+
+import org.openapitools.client.model.Order;
+
+import java.lang.Exception;
+import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.TimeZone;
+
+import okio.ByteString;
+import org.junit.*;
+import org.threeten.bp.LocalDate;
+import org.threeten.bp.OffsetDateTime;
+import org.threeten.bp.ZoneId;
+import org.threeten.bp.ZoneOffset;
+import org.threeten.bp.format.DateTimeFormatter;
+
+import static org.junit.Assert.*;
+
+public class JSONTest {
+    private ApiClient apiClient = null;
+    private JSON json = null;
+    private Order order = null;
+
+    @Before
+    public void setup() {
+        apiClient = new ApiClient();
+        json = apiClient.getJSON();
+        order = new Order();
+    }
+
+    @Test
+    public void testSqlDateTypeAdapter() {
+        final String str = "\"2015-11-07\"";
+        final java.sql.Date date = java.sql.Date.valueOf("2015-11-07");
+
+        assertEquals(str, json.serialize(date));
+        assertEquals(json.deserialize(str, java.sql.Date.class), date);
+        assertEquals(json.deserialize("\"2015-11-07T03:49:09.356" + getCurrentTimezoneOffset() + "\"", java.sql.Date.class).toString(), date.toString());
+
+        // custom date format: without day
+        DateFormat format = new SimpleDateFormat("yyyy-MM");
+        apiClient.setSqlDateFormat(format);
+        String dateStr = "\"2015-11\"";
+        assertEquals(dateStr, json.serialize(json.deserialize("\"2015-11-07T03:49:09Z\"", java.sql.Date.class)));
+        assertEquals(dateStr, json.serialize(json.deserialize("\"2015-11\"", java.sql.Date.class)));
+    }
+
+    @Test
+    public void testDateTypeAdapter() {
+        Calendar cal = new GregorianCalendar(2015, 10, 7, 3, 49, 9);
+        cal.setTimeZone(TimeZone.getTimeZone("UTC"));
+
+        assertEquals(json.deserialize("\"2015-11-07T05:49:09+02\"", Date.class), cal.getTime());
+
+        cal.set(Calendar.MILLISECOND, 300);
+        assertEquals(json.deserialize("\"2015-11-07T03:49:09.3Z\"", Date.class), cal.getTime());
+
+        cal.set(Calendar.MILLISECOND, 356);
+        Date date = cal.getTime();
+
+        final String utcDate = "\"2015-11-07T03:49:09.356Z\"";
+        assertEquals(json.deserialize(utcDate, Date.class), date);
+        assertEquals(json.deserialize("\"2015-11-07T03:49:09.356+00:00\"", Date.class), date);
+        assertEquals(json.deserialize("\"2015-11-07T05:49:09.356+02:00\"", Date.class), date);
+        assertEquals(json.deserialize("\"2015-11-07T02:49:09.356-01:00\"", Date.class), date);
+        assertEquals(json.deserialize("\"2015-11-07T03:49:09.356Z\"", Date.class), date);
+        assertEquals(json.deserialize("\"2015-11-07T03:49:09.356+00\"", Date.class), date);
+        assertEquals(json.deserialize("\"2015-11-07T02:49:09.356-0100\"", Date.class), date);
+        assertEquals(json.deserialize("\"2015-11-07T03:49:09.356456789Z\"", Date.class), date);
+
+        assertEquals(utcDate, json.serialize(date));
+
+        // custom datetime format: without milli-seconds, custom time zone
+        DateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
+        format.setTimeZone(TimeZone.getTimeZone("GMT+10"));
+        apiClient.setDateFormat(format);
+
+        String dateStr = "\"2015-11-07T13:49:09+10:00\"";
+        assertEquals(dateStr, json.serialize(json.deserialize("\"2015-11-07T03:49:09+00:00\"", Date.class)));
+        assertEquals(dateStr, json.serialize(json.deserialize("\"2015-11-07T03:49:09Z\"", Date.class)));
+        assertEquals(dateStr, json.serialize(json.deserialize("\"2015-11-07T00:49:09-03:00\"", Date.class)));
+
+        try {
+            // invalid time zone format
+            json.deserialize("\"2015-11-07T03:49:09+00\"", Date.class);
+            fail("json parsing should fail");
+        } catch (RuntimeException e) {
+            // OK
+        }
+        try {
+            // unexpected miliseconds
+            json.deserialize("\"2015-11-07T03:49:09.000Z\"", Date.class);
+            fail("json parsing should fail");
+        } catch (RuntimeException e) {
+            // OK
+        }
+
+    }
+
+    @Test
+    public void testOffsetDateTimeTypeAdapter() {
+        final String str = "\"2016-09-09T08:02:03.123-03:00\"";
+        OffsetDateTime date = OffsetDateTime.of(2016, 9, 9, 8, 2, 3, 123000000, ZoneOffset.of("-3"));
+
+        assertEquals(str, json.serialize(date));
+        //Use toString() instead of isEqual to verify that the offset is preserved
+        assertEquals(json.deserialize(str, OffsetDateTime.class).toString(), date.toString());
+    }
+
+    @Test
+    public void testLocalDateTypeAdapter() {
+        final String str = "\"2016-09-09\"";
+        final LocalDate date = LocalDate.of(2016, 9, 9);
+
+        assertEquals(str, json.serialize(date));
+        assertEquals(json.deserialize(str, LocalDate.class), date);
+    }
+
+
+    @Test
+    public void testDefaultDate() throws Exception {
+        final DateTimeFormatter datetimeFormat = DateTimeFormatter.ISO_OFFSET_DATE_TIME;
+        final String dateStr = "2015-11-07T14:11:05.267Z";
+        order.setShipDate(datetimeFormat.parse(dateStr, OffsetDateTime.FROM));
+
+        String str = json.serialize(order);
+        Type type = new TypeToken<Order>() { }.getType();
+        Order o = json.deserialize(str, type);
+        assertEquals(dateStr, datetimeFormat.format(o.getShipDate()));
+    }
+
+    @Test
+    public void testCustomDate() throws Exception {
+        final DateTimeFormatter datetimeFormat = DateTimeFormatter.ISO_OFFSET_DATE_TIME.withZone(ZoneId.of("Etc/GMT+2"));
+        final String dateStr = "2015-11-07T14:11:05-02:00";
+        order.setShipDate(datetimeFormat.parse(dateStr, OffsetDateTime.FROM));
+
+        String str = json.serialize(order);
+        Type type = new TypeToken<Order>() { }.getType();
+        Order o = json.deserialize(str, type);
+        assertEquals(dateStr, datetimeFormat.format(o.getShipDate()));
+    }
+
+    @Test
+    public void testByteArrayTypeAdapterSerialization() {
+        // Arrange
+        final String expectedBytesAsString = "Let's pretend this a jpg or something";
+        final byte[] expectedBytes = expectedBytesAsString.getBytes(StandardCharsets.UTF_8);
+
+        // Act
+        String serializedBytesWithQuotes = json.serialize(expectedBytes);
+
+        // Assert
+        String serializedBytes = serializedBytesWithQuotes.substring(1, serializedBytesWithQuotes.length() - 1);
+        if (json.getGson().htmlSafe()) {
+            serializedBytes = serializedBytes.replaceAll("\\\\u003d", "=");
+        }
+        ByteString actualAsByteString = ByteString.decodeBase64(serializedBytes);
+        byte[] actualBytes = actualAsByteString.toByteArray();
+        assertEquals(expectedBytesAsString, new String(actualBytes, StandardCharsets.UTF_8));
+    }
+
+    @Test
+    public void testByteArrayTypeAdapterDeserialization() {
+        // Arrange
+        final String expectedBytesAsString = "Let's pretend this a jpg or something";
+        final byte[] expectedBytes = expectedBytesAsString.getBytes(StandardCharsets.UTF_8);
+        final ByteString expectedByteString = ByteString.of(expectedBytes);
+        final String serializedBytes = expectedByteString.base64();
+        final String serializedBytesWithQuotes = "\"" + serializedBytes + "\"";
+        Type type = new TypeToken<byte[]>() { }.getType();
+
+        // Act
+        byte[] actualDeserializedBytes = json.deserialize(serializedBytesWithQuotes, type);
+
+        // Assert
+        assertEquals(expectedBytesAsString, new String(actualDeserializedBytes, StandardCharsets.UTF_8));
+    }
+
+    // Obtained 22JAN2018 from stackoverflow answer by PuguaSoft https://stackoverflow.com/questions/11399491/java-timezone-offset
+    // Direct link https://stackoverflow.com/a/16680815/3166133
+    public static String getCurrentTimezoneOffset() {
+
+        TimeZone tz = TimeZone.getDefault();
+        Calendar cal = GregorianCalendar.getInstance(tz);
+        int offsetInMillis = tz.getOffset(cal.getTimeInMillis());
+
+        String offset = String.format("%02d:%02d", Math.abs(offsetInMillis / 3600000), Math.abs((offsetInMillis / 60000) % 60));
+        offset = (offsetInMillis >= 0 ? "+" : "-") + offset;
+
+        return offset;
+    }
+}

samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/StringUtilTest.java

@@ -0,0 +1,33 @@
+package org.openapitools.client;
+
+import org.junit.*;
+import static org.junit.Assert.*;
+
+
+public class StringUtilTest {
+    @Test
+    public void testContainsIgnoreCase() {
+        assertTrue(StringUtil.containsIgnoreCase(new String[]{"abc"}, "abc"));
+        assertTrue(StringUtil.containsIgnoreCase(new String[]{"abc"}, "ABC"));
+        assertTrue(StringUtil.containsIgnoreCase(new String[]{"ABC"}, "abc"));
+        assertTrue(StringUtil.containsIgnoreCase(new String[]{null, "abc"}, "ABC"));
+        assertTrue(StringUtil.containsIgnoreCase(new String[]{null, "abc"}, null));
+
+        assertFalse(StringUtil.containsIgnoreCase(new String[]{"abc"}, "def"));
+        assertFalse(StringUtil.containsIgnoreCase(new String[]{}, "ABC"));
+        assertFalse(StringUtil.containsIgnoreCase(new String[]{}, null));
+    }
+
+    @Test
+    public void testJoin() {
+        String[] array = {"aa", "bb", "cc"};
+        assertEquals("aa,bb,cc", StringUtil.join(array, ","));
+        assertEquals("aa, bb, cc", StringUtil.join(array, ", "));
+        assertEquals("aabbcc", StringUtil.join(array, ""));
+        assertEquals("aa bb cc", StringUtil.join(array, " "));
+        assertEquals("aa\nbb\ncc", StringUtil.join(array, "\n"));
+
+        assertEquals("", StringUtil.join(new String[]{}, ","));
+        assertEquals("abc", StringUtil.join(new String[]{"abc"}, ","));
+    }
+}

samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/auth/ApiKeyAuthTest.java

@@ -0,0 +1,76 @@
+package org.openapitools.client.auth;
+
+import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.List;
+
+import org.openapitools.client.Pair;
+import org.junit.*;
+import static org.junit.Assert.*;
+
+
+public class ApiKeyAuthTest {
+    @Test
+    public void testApplyToParamsInQuery() {
+        List<Pair> queryParams = new ArrayList<Pair>();
+        Map<String, String> headerParams = new HashMap<String, String>();
+
+        ApiKeyAuth auth = new ApiKeyAuth("query", "api_key");
+        auth.setApiKey("my-api-key");
+        auth.applyToParams(queryParams, headerParams);
+
+        assertEquals(1, queryParams.size());
+        for (Pair queryParam : queryParams) {
+            assertEquals("my-api-key", queryParam.getValue());
+        }
+
+        // no changes to header parameters
+        assertEquals(0, headerParams.size());
+    }
+
+    @Test
+    public void testApplyToParamsInQueryWithNullValue() {
+        List<Pair> queryParams = new ArrayList<Pair>();
+        Map<String, String> headerParams = new HashMap<String, String>();
+
+        ApiKeyAuth auth = new ApiKeyAuth("query", "api_key");
+        auth.setApiKey(null);
+        auth.applyToParams(queryParams, headerParams);
+
+        // no changes to parameters
+        assertEquals(0, queryParams.size());
+        assertEquals(0, headerParams.size());
+    }
+
+    @Test
+    public void testApplyToParamsInHeaderWithPrefix() {
+        List<Pair> queryParams = new ArrayList<Pair>();
+        Map<String, String> headerParams = new HashMap<String, String>();
+
+        ApiKeyAuth auth = new ApiKeyAuth("header", "X-API-TOKEN");
+        auth.setApiKey("my-api-token");
+        auth.setApiKeyPrefix("Token");
+        auth.applyToParams(queryParams, headerParams);
+
+        // no changes to query parameters
+        assertEquals(0, queryParams.size());
+        assertEquals(1, headerParams.size());
+        assertEquals("Token my-api-token", headerParams.get("X-API-TOKEN"));
+    }
+
+    @Test
+    public void testApplyToParamsInHeaderWithNullValue() {
+        List<Pair> queryParams = new ArrayList<Pair>();
+        Map<String, String> headerParams = new HashMap<String, String>();
+
+        ApiKeyAuth auth = new ApiKeyAuth("header", "X-API-TOKEN");
+        auth.setApiKey(null);
+        auth.setApiKeyPrefix("Token");
+        auth.applyToParams(queryParams, headerParams);
+
+        // no changes to parameters
+        assertEquals(0, queryParams.size());
+        assertEquals(0, headerParams.size());
+    }
+}

samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/auth/HttpBasicAuthTest.java

@@ -0,0 +1,62 @@
+package org.openapitools.client.auth;
+
+import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.List;
+
+import org.openapitools.client.Pair;
+import org.junit.*;
+import static org.junit.Assert.*;
+
+
+public class HttpBasicAuthTest {
+    HttpBasicAuth auth = null;
+
+    @Before
+    public void setup() {
+        auth = new HttpBasicAuth();
+    }
+
+    @Test
+    public void testApplyToParams() {
+        List<Pair> queryParams = new ArrayList<Pair>();
+        Map<String, String> headerParams = new HashMap<String, String>();
+
+        auth.setUsername("my-username");
+        auth.setPassword("my-password");
+        auth.applyToParams(queryParams, headerParams);
+
+        // no changes to query parameters
+        assertEquals(0, queryParams.size());
+        assertEquals(1, headerParams.size());
+        // the string below is base64-encoded result of "my-username:my-password" with the "Basic " prefix
+        String expected = "Basic bXktdXNlcm5hbWU6bXktcGFzc3dvcmQ=";
+        assertEquals(expected, headerParams.get("Authorization"));
+
+        // null username should be treated as empty string
+        auth.setUsername(null);
+        auth.applyToParams(queryParams, headerParams);
+        // the string below is base64-encoded result of ":my-password" with the "Basic " prefix
+        expected = "Basic Om15LXBhc3N3b3Jk";
+        assertEquals(expected, headerParams.get("Authorization"));
+
+        // null password should be treated as empty string
+        auth.setUsername("my-username");
+        auth.setPassword(null);
+        auth.applyToParams(queryParams, headerParams);
+        // the string below is base64-encoded result of "my-username:" with the "Basic " prefix
+        expected = "Basic bXktdXNlcm5hbWU6";
+        assertEquals(expected, headerParams.get("Authorization"));
+
+        // null username and password should be ignored
+        queryParams = new ArrayList<Pair>();
+        headerParams = new HashMap<String, String>();
+        auth.setUsername(null);
+        auth.setPassword(null);
+        auth.applyToParams(queryParams, headerParams);
+        // no changes to parameters
+        assertEquals(0, queryParams.size());
+        assertEquals(0, headerParams.size());
+    }
+}

samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/EnumValueTest.java

@@ -0,0 +1,56 @@
+package org.openapitools.client.model;
+
+import org.junit.Test;
+
+import com.google.gson.Gson;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class EnumValueTest {
+
+    @Test
+    public void testEnumClass() {
+        assertEquals(EnumClass._ABC.toString(), "_abc");
+        assertEquals(EnumClass._EFG.toString(), "-efg");
+        assertEquals(EnumClass._XYZ_.toString(), "(xyz)");
+    }
+
+    @Test
+    public void testEnumTest() {
+        // test enum value
+        EnumTest enumTest = new EnumTest();
+        enumTest.setEnumString(EnumTest.EnumStringEnum.LOWER);
+        enumTest.setEnumInteger(EnumTest.EnumIntegerEnum.NUMBER_1);
+        enumTest.setEnumNumber(EnumTest.EnumNumberEnum.NUMBER_1_DOT_1);
+
+        assertEquals(EnumTest.EnumStringEnum.UPPER.toString(), "UPPER");
+        assertEquals(EnumTest.EnumStringEnum.UPPER.getValue(), "UPPER");
+        assertEquals(EnumTest.EnumStringEnum.LOWER.toString(), "lower");
+        assertEquals(EnumTest.EnumStringEnum.LOWER.getValue(), "lower");
+
+        assertEquals(EnumTest.EnumIntegerEnum.NUMBER_1.toString(), "1");
+        assertTrue(EnumTest.EnumIntegerEnum.NUMBER_1.getValue() == 1);
+        assertEquals(EnumTest.EnumIntegerEnum.NUMBER_MINUS_1.toString(), "-1");
+        assertTrue(EnumTest.EnumIntegerEnum.NUMBER_MINUS_1.getValue() == -1);
+
+        assertEquals(EnumTest.EnumNumberEnum.NUMBER_1_DOT_1.toString(), "1.1");
+        assertTrue(EnumTest.EnumNumberEnum.NUMBER_1_DOT_1.getValue() == 1.1);
+        assertEquals(EnumTest.EnumNumberEnum.NUMBER_MINUS_1_DOT_2.toString(), "-1.2");
+        assertTrue(EnumTest.EnumNumberEnum.NUMBER_MINUS_1_DOT_2.getValue() == -1.2);
+
+        // test serialization
+        Gson gson = new Gson();
+        String json = gson.toJson(enumTest);
+        assertEquals(json, "{\"enum_string\":\"lower\",\"enum_integer\":1,\"enum_number\":1.1}");
+
+        // test deserialization
+        EnumTest fromString = gson.fromJson(json, EnumTest.class);
+        assertEquals(fromString.getEnumString().toString(), "lower");
+        assertEquals(fromString.getEnumString().getValue(), "lower");
+        assertEquals(fromString.getEnumInteger().toString(), "1");
+        assertTrue(fromString.getEnumInteger().getValue() == 1);
+        assertEquals(fromString.getEnumNumber().toString(), "1.1");
+        assertTrue(fromString.getEnumNumber().getValue() == 1.1);
+    }
+}

samples/client/petstore/java/rest-assured/docs/MapTest.md

@@ -6,6 +6,8 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **mapMapOfString** | [**Map<String, Map<String, String>>**](Map.md) |  |  [optional]
 **mapOfEnumString** | [**Map<String, InnerEnum>**](#Map<String, InnerEnum>) |  |  [optional]
+**directMap** | **Map<String, Boolean>** |  |  [optional]
+**indirectMap** | [**StringBooleanMap**](StringBooleanMap.md) |  |  [optional]
 
 
 <a name="Map<String, InnerEnum>"></a>

samples/client/petstore/java/rest-assured/docs/StringBooleanMap.md

@@ -0,0 +1,9 @@
+
+# StringBooleanMap
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+
+

samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MapTest.java

@@ -26,6 +26,7 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.openapitools.client.model.StringBooleanMap;
 
 /**
  * MapTest
@@ -87,6 +88,14 @@ public class MapTest {
   @SerializedName(SERIALIZED_NAME_MAP_OF_ENUM_STRING)
   private Map<String, InnerEnum> mapOfEnumString = null;
 
+  public static final String SERIALIZED_NAME_DIRECT_MAP = "direct_map";
+  @SerializedName(SERIALIZED_NAME_DIRECT_MAP)
+  private Map<String, Boolean> directMap = null;
+
+  public static final String SERIALIZED_NAME_INDIRECT_MAP = "indirect_map";
+  @SerializedName(SERIALIZED_NAME_INDIRECT_MAP)
+  private StringBooleanMap indirectMap = null;
+
   public MapTest mapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
     this.mapMapOfString = mapMapOfString;
     return this;
@@ -139,6 +148,50 @@ public class MapTest {
     this.mapOfEnumString = mapOfEnumString;
   }
 
+  public MapTest directMap(Map<String, Boolean> directMap) {
+    this.directMap = directMap;
+    return this;
+  }
+
+  public MapTest putDirectMapItem(String key, Boolean directMapItem) {
+    if (this.directMap == null) {
+      this.directMap = new HashMap<String, Boolean>();
+    }
+    this.directMap.put(key, directMapItem);
+    return this;
+  }
+
+   /**
+   * Get directMap
+   * @return directMap
+  **/
+  @ApiModelProperty(value = "")
+  public Map<String, Boolean> getDirectMap() {
+    return directMap;
+  }
+
+  public void setDirectMap(Map<String, Boolean> directMap) {
+    this.directMap = directMap;
+  }
+
+  public MapTest indirectMap(StringBooleanMap indirectMap) {
+    this.indirectMap = indirectMap;
+    return this;
+  }
+
+   /**
+   * Get indirectMap
+   * @return indirectMap
+  **/
+  @ApiModelProperty(value = "")
+  public StringBooleanMap getIndirectMap() {
+    return indirectMap;
+  }
+
+  public void setIndirectMap(StringBooleanMap indirectMap) {
+    this.indirectMap = indirectMap;
+  }
+
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -150,12 +203,14 @@ public class MapTest {
     }
     MapTest mapTest = (MapTest) o;
     return Objects.equals(this.mapMapOfString, mapTest.mapMapOfString) &&
-        Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString);
+        Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString) &&
+        Objects.equals(this.directMap, mapTest.directMap) &&
+        Objects.equals(this.indirectMap, mapTest.indirectMap);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(mapMapOfString, mapOfEnumString);
+    return Objects.hash(mapMapOfString, mapOfEnumString, directMap, indirectMap);
   }
 
 
@@ -166,6 +221,8 @@ public class MapTest {
     
     sb.append("    mapMapOfString: ").append(toIndentedString(mapMapOfString)).append("\n");
     sb.append("    mapOfEnumString: ").append(toIndentedString(mapOfEnumString)).append("\n");
+    sb.append("    directMap: ").append(toIndentedString(directMap)).append("\n");
+    sb.append("    indirectMap: ").append(toIndentedString(indirectMap)).append("\n");
     sb.append("}");
     return sb.toString();
   }

samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/OuterComposite.java

@@ -88,7 +88,7 @@ public class OuterComposite {
    * @return myBoolean
   **/
   @ApiModelProperty(value = "")
-  public Boolean getMyBoolean() {
+  public Boolean isMyBoolean() {
     return myBoolean;
   }
 

samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/StringBooleanMap.java

@@ -0,0 +1,65 @@
+/*
+ * OpenAPI 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
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * StringBooleanMap
+ */
+
+public class StringBooleanMap extends HashMap<String, Boolean> {
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    return super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class StringBooleanMap {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).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/resteasy/docs/MapTest.md

@@ -6,6 +6,8 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **mapMapOfString** | [**Map<String, Map<String, String>>**](Map.md) |  |  [optional]
 **mapOfEnumString** | [**Map<String, InnerEnum>**](#Map<String, InnerEnum>) |  |  [optional]
+**directMap** | **Map<String, Boolean>** |  |  [optional]
+**indirectMap** | [**StringBooleanMap**](StringBooleanMap.md) |  |  [optional]
 
 
 <a name="Map<String, InnerEnum>"></a>

samples/client/petstore/java/resteasy/docs/StringBooleanMap.md

@@ -0,0 +1,9 @@
+
+# StringBooleanMap
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+
+

samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MapTest.java

@@ -23,6 +23,7 @@ import io.swagger.annotations.ApiModelProperty;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.openapitools.client.model.StringBooleanMap;
 
 /**
  * MapTest
@@ -70,6 +71,12 @@ public class MapTest {
   @JsonProperty("map_of_enum_string")
   private Map<String, InnerEnum> mapOfEnumString = null;
 
+  @JsonProperty("direct_map")
+  private Map<String, Boolean> directMap = null;
+
+  @JsonProperty("indirect_map")
+  private StringBooleanMap indirectMap = null;
+
   public MapTest mapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
     this.mapMapOfString = mapMapOfString;
     return this;
@@ -122,6 +129,50 @@ public class MapTest {
     this.mapOfEnumString = mapOfEnumString;
   }
 
+  public MapTest directMap(Map<String, Boolean> directMap) {
+    this.directMap = directMap;
+    return this;
+  }
+
+  public MapTest putDirectMapItem(String key, Boolean directMapItem) {
+    if (this.directMap == null) {
+      this.directMap = new HashMap<String, Boolean>();
+    }
+    this.directMap.put(key, directMapItem);
+    return this;
+  }
+
+   /**
+   * Get directMap
+   * @return directMap
+  **/
+  @ApiModelProperty(value = "")
+  public Map<String, Boolean> getDirectMap() {
+    return directMap;
+  }
+
+  public void setDirectMap(Map<String, Boolean> directMap) {
+    this.directMap = directMap;
+  }
+
+  public MapTest indirectMap(StringBooleanMap indirectMap) {
+    this.indirectMap = indirectMap;
+    return this;
+  }
+
+   /**
+   * Get indirectMap
+   * @return indirectMap
+  **/
+  @ApiModelProperty(value = "")
+  public StringBooleanMap getIndirectMap() {
+    return indirectMap;
+  }
+
+  public void setIndirectMap(StringBooleanMap indirectMap) {
+    this.indirectMap = indirectMap;
+  }
+
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -133,12 +184,14 @@ public class MapTest {
     }
     MapTest mapTest = (MapTest) o;
     return Objects.equals(this.mapMapOfString, mapTest.mapMapOfString) &&
-        Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString);
+        Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString) &&
+        Objects.equals(this.directMap, mapTest.directMap) &&
+        Objects.equals(this.indirectMap, mapTest.indirectMap);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(mapMapOfString, mapOfEnumString);
+    return Objects.hash(mapMapOfString, mapOfEnumString, directMap, indirectMap);
   }
 
 
@@ -149,6 +202,8 @@ public class MapTest {
     
     sb.append("    mapMapOfString: ").append(toIndentedString(mapMapOfString)).append("\n");
     sb.append("    mapOfEnumString: ").append(toIndentedString(mapOfEnumString)).append("\n");
+    sb.append("    directMap: ").append(toIndentedString(directMap)).append("\n");
+    sb.append("    indirectMap: ").append(toIndentedString(indirectMap)).append("\n");
     sb.append("}");
     return sb.toString();
   }

samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/OuterComposite.java

@@ -82,7 +82,7 @@ public class OuterComposite {
    * @return myBoolean
   **/
   @ApiModelProperty(value = "")
-  public Boolean getMyBoolean() {
+  public Boolean isMyBoolean() {
     return myBoolean;
   }
 

samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/StringBooleanMap.java

@@ -0,0 +1,65 @@
+/*
+ * OpenAPI 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
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * StringBooleanMap
+ */
+
+public class StringBooleanMap extends HashMap<String, Boolean> {
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    return super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class StringBooleanMap {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).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/resttemplate-withXml/docs/MapTest.md

@@ -6,6 +6,8 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **mapMapOfString** | [**Map<String, Map<String, String>>**](Map.md) |  |  [optional]
 **mapOfEnumString** | [**Map<String, InnerEnum>**](#Map<String, InnerEnum>) |  |  [optional]
+**directMap** | **Map<String, Boolean>** |  |  [optional]
+**indirectMap** | [**StringBooleanMap**](StringBooleanMap.md) |  |  [optional]
 
 
 <a name="Map<String, InnerEnum>"></a>

samples/client/petstore/java/resttemplate-withXml/docs/StringBooleanMap.md

@@ -0,0 +1,9 @@
+
+# StringBooleanMap
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+
+

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MapTest.java

@@ -23,6 +23,7 @@ import io.swagger.annotations.ApiModelProperty;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.openapitools.client.model.StringBooleanMap;
 import com.fasterxml.jackson.dataformat.xml.annotation.*;
 import javax.xml.bind.annotation.*;
 
@@ -83,6 +84,18 @@ public class MapTest {
   @XmlElement(name = "inner")
   private Map<String, InnerEnum> mapOfEnumString = null;
 
+  @JsonProperty("direct_map")
+  // Is a container wrapped=false
+  // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
+  // items.example= items.type=Boolean
+  @XmlElement(name = "inner")
+  private Map<String, Boolean> directMap = null;
+
+  @JsonProperty("indirect_map")
+  @JacksonXmlProperty(localName = "indirect_map")
+  @XmlElement(name = "indirect_map")
+  private StringBooleanMap indirectMap = null;
+
   public MapTest mapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
     this.mapMapOfString = mapMapOfString;
     return this;
@@ -135,6 +148,50 @@ public class MapTest {
     this.mapOfEnumString = mapOfEnumString;
   }
 
+  public MapTest directMap(Map<String, Boolean> directMap) {
+    this.directMap = directMap;
+    return this;
+  }
+
+  public MapTest putDirectMapItem(String key, Boolean directMapItem) {
+    if (this.directMap == null) {
+      this.directMap = new HashMap<String, Boolean>();
+    }
+    this.directMap.put(key, directMapItem);
+    return this;
+  }
+
+   /**
+   * Get directMap
+   * @return directMap
+  **/
+  @ApiModelProperty(value = "")
+  public Map<String, Boolean> getDirectMap() {
+    return directMap;
+  }
+
+  public void setDirectMap(Map<String, Boolean> directMap) {
+    this.directMap = directMap;
+  }
+
+  public MapTest indirectMap(StringBooleanMap indirectMap) {
+    this.indirectMap = indirectMap;
+    return this;
+  }
+
+   /**
+   * Get indirectMap
+   * @return indirectMap
+  **/
+  @ApiModelProperty(value = "")
+  public StringBooleanMap getIndirectMap() {
+    return indirectMap;
+  }
+
+  public void setIndirectMap(StringBooleanMap indirectMap) {
+    this.indirectMap = indirectMap;
+  }
+
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -146,12 +203,14 @@ public class MapTest {
     }
     MapTest mapTest = (MapTest) o;
     return Objects.equals(this.mapMapOfString, mapTest.mapMapOfString) &&
-        Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString);
+        Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString) &&
+        Objects.equals(this.directMap, mapTest.directMap) &&
+        Objects.equals(this.indirectMap, mapTest.indirectMap);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(mapMapOfString, mapOfEnumString);
+    return Objects.hash(mapMapOfString, mapOfEnumString, directMap, indirectMap);
   }
 
 
@@ -162,6 +221,8 @@ public class MapTest {
     
     sb.append("    mapMapOfString: ").append(toIndentedString(mapMapOfString)).append("\n");
     sb.append("    mapOfEnumString: ").append(toIndentedString(mapOfEnumString)).append("\n");
+    sb.append("    directMap: ").append(toIndentedString(directMap)).append("\n");
+    sb.append("    indirectMap: ").append(toIndentedString(indirectMap)).append("\n");
     sb.append("}");
     return sb.toString();
   }

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterComposite.java

@@ -93,7 +93,7 @@ public class OuterComposite {
    * @return myBoolean
   **/
   @ApiModelProperty(value = "")
-  public Boolean getMyBoolean() {
+  public Boolean isMyBoolean() {
     return myBoolean;
   }
 

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/StringBooleanMap.java

@@ -0,0 +1,70 @@
+/*
+ * OpenAPI 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
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import com.fasterxml.jackson.dataformat.xml.annotation.*;
+import javax.xml.bind.annotation.*;
+
+/**
+ * StringBooleanMap
+ */
+
+@XmlRootElement(name = "StringBooleanMap")
+@XmlAccessorType(XmlAccessType.FIELD)
+@JacksonXmlRootElement(localName = "StringBooleanMap")
+public class StringBooleanMap extends HashMap<String, Boolean> {
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    return super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class StringBooleanMap {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).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/resttemplate/docs/MapTest.md

@@ -6,6 +6,8 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **mapMapOfString** | [**Map<String, Map<String, String>>**](Map.md) |  |  [optional]
 **mapOfEnumString** | [**Map<String, InnerEnum>**](#Map<String, InnerEnum>) |  |  [optional]
+**directMap** | **Map<String, Boolean>** |  |  [optional]
+**indirectMap** | [**StringBooleanMap**](StringBooleanMap.md) |  |  [optional]
 
 
 <a name="Map<String, InnerEnum>"></a>

samples/client/petstore/java/resttemplate/docs/StringBooleanMap.md

@@ -0,0 +1,9 @@
+
+# StringBooleanMap
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+
+

samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MapTest.java

@@ -23,6 +23,7 @@ import io.swagger.annotations.ApiModelProperty;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.openapitools.client.model.StringBooleanMap;
 
 /**
  * MapTest
@@ -70,6 +71,12 @@ public class MapTest {
   @JsonProperty("map_of_enum_string")
   private Map<String, InnerEnum> mapOfEnumString = null;
 
+  @JsonProperty("direct_map")
+  private Map<String, Boolean> directMap = null;
+
+  @JsonProperty("indirect_map")
+  private StringBooleanMap indirectMap = null;
+
   public MapTest mapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
     this.mapMapOfString = mapMapOfString;
     return this;
@@ -122,6 +129,50 @@ public class MapTest {
     this.mapOfEnumString = mapOfEnumString;
   }
 
+  public MapTest directMap(Map<String, Boolean> directMap) {
+    this.directMap = directMap;
+    return this;
+  }
+
+  public MapTest putDirectMapItem(String key, Boolean directMapItem) {
+    if (this.directMap == null) {
+      this.directMap = new HashMap<String, Boolean>();
+    }
+    this.directMap.put(key, directMapItem);
+    return this;
+  }
+
+   /**
+   * Get directMap
+   * @return directMap
+  **/
+  @ApiModelProperty(value = "")
+  public Map<String, Boolean> getDirectMap() {
+    return directMap;
+  }
+
+  public void setDirectMap(Map<String, Boolean> directMap) {
+    this.directMap = directMap;
+  }
+
+  public MapTest indirectMap(StringBooleanMap indirectMap) {
+    this.indirectMap = indirectMap;
+    return this;
+  }
+
+   /**
+   * Get indirectMap
+   * @return indirectMap
+  **/
+  @ApiModelProperty(value = "")
+  public StringBooleanMap getIndirectMap() {
+    return indirectMap;
+  }
+
+  public void setIndirectMap(StringBooleanMap indirectMap) {
+    this.indirectMap = indirectMap;
+  }
+
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -133,12 +184,14 @@ public class MapTest {
     }
     MapTest mapTest = (MapTest) o;
     return Objects.equals(this.mapMapOfString, mapTest.mapMapOfString) &&
-        Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString);
+        Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString) &&
+        Objects.equals(this.directMap, mapTest.directMap) &&
+        Objects.equals(this.indirectMap, mapTest.indirectMap);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(mapMapOfString, mapOfEnumString);
+    return Objects.hash(mapMapOfString, mapOfEnumString, directMap, indirectMap);
   }
 
 
@@ -149,6 +202,8 @@ public class MapTest {
     
     sb.append("    mapMapOfString: ").append(toIndentedString(mapMapOfString)).append("\n");
     sb.append("    mapOfEnumString: ").append(toIndentedString(mapOfEnumString)).append("\n");
+    sb.append("    directMap: ").append(toIndentedString(directMap)).append("\n");
+    sb.append("    indirectMap: ").append(toIndentedString(indirectMap)).append("\n");
     sb.append("}");
     return sb.toString();
   }

samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterComposite.java

@@ -82,7 +82,7 @@ public class OuterComposite {
    * @return myBoolean
   **/
   @ApiModelProperty(value = "")
-  public Boolean getMyBoolean() {
+  public Boolean isMyBoolean() {
     return myBoolean;
   }
 

samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/StringBooleanMap.java

@@ -0,0 +1,65 @@
+/*
+ * OpenAPI 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
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * StringBooleanMap
+ */
+
+public class StringBooleanMap extends HashMap<String, Boolean> {
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    return super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class StringBooleanMap {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).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/resttemplate/src/test/java/org/openapitools/client/ApiClientTest.java

@@ -0,0 +1,254 @@
+package org.openapitools.client;
+
+import org.openapitools.client.auth.*;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+import org.junit.*;
+import org.springframework.http.MediaType;
+import org.springframework.util.MultiValueMap;
+
+import static org.junit.Assert.*;
+
+
+public class ApiClientTest {
+    ApiClient apiClient = null;
+
+    @Before
+    public void setup() {
+        apiClient = new ApiClient();
+    }
+
+    /**
+     *
+     */
+    @Test
+    public void testParseAndFormatDate() {
+        // default date format
+        String dateStr = "2015-11-07T03:49:09.356Z";
+        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T03:49:09.356+00:00")));
+        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T03:49:09.356Z")));
+        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T05:49:09.356+02:00")));
+        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T02:49:09.356-01:00")));
+
+        // custom date format: without milli-seconds, custom time zone
+        DateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
+        format.setTimeZone(TimeZone.getTimeZone("GMT+10"));
+        apiClient.setDateFormat(format);
+        dateStr = "2015-11-07T13:49:09+10:00";
+        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T03:49:09+00:00")));
+        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T03:49:09Z")));
+        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T00:49:09-03:00")));
+        assertEquals(dateStr, apiClient.formatDate(apiClient.parseDate("2015-11-07T13:49:09+10:00")));
+    }
+
+    @Test
+    public void testIsJsonMime() {
+        assertFalse(apiClient.isJsonMime((String) null));
+        assertFalse(apiClient.isJsonMime(""));
+        assertFalse(apiClient.isJsonMime("text/plain"));
+        assertFalse(apiClient.isJsonMime("application/xml"));
+        assertFalse(apiClient.isJsonMime("application/jsonp"));
+        assertFalse(apiClient.isJsonMime("example/json"));
+        assertFalse(apiClient.isJsonMime("example/foo+bar+jsonx"));
+        assertFalse(apiClient.isJsonMime("example/foo+bar+xjson"));
+
+        assertTrue(apiClient.isJsonMime("application/json"));
+        assertTrue(apiClient.isJsonMime("application/json; charset=UTF8"));
+        assertTrue(apiClient.isJsonMime("APPLICATION/JSON"));
+
+        assertTrue(apiClient.isJsonMime("application/problem+json"));
+        assertTrue(apiClient.isJsonMime("APPLICATION/PROBLEM+JSON"));
+        assertTrue(apiClient.isJsonMime("application/json\t"));
+        assertTrue(apiClient.isJsonMime("example/foo+bar+json"));
+        assertTrue(apiClient.isJsonMime("example/foo+json;x;y"));
+        assertTrue(apiClient.isJsonMime("example/foo+json\t;"));
+        assertTrue(apiClient.isJsonMime("Example/fOO+JSON"));
+    }
+
+    @Test
+    public void testSelectHeaderAccept() {
+        String[] accepts = {"application/json", "application/xml"};
+        assertEquals(Arrays.asList(MediaType.parseMediaType("application/json")), apiClient.selectHeaderAccept(accepts));
+
+        accepts = new String[]{"APPLICATION/XML", "APPLICATION/JSON"};
+        assertEquals(Arrays.asList(MediaType.parseMediaType("APPLICATION/JSON")), apiClient.selectHeaderAccept(accepts));
+
+        accepts = new String[]{"application/xml", "application/json; charset=UTF8"};
+        assertEquals(Arrays.asList(MediaType.parseMediaType("application/json; charset=UTF8")), apiClient.selectHeaderAccept(accepts));
+
+        accepts = new String[]{"text/plain", "application/xml"};
+        assertEquals(Arrays.asList(MediaType.parseMediaType("text/plain"),MediaType.parseMediaType("application/xml")), apiClient.selectHeaderAccept(accepts));
+
+        accepts = new String[]{};
+        assertNull(apiClient.selectHeaderAccept(accepts));
+    }
+
+    @Test
+    public void testSelectHeaderContentType() {
+        String[] contentTypes = {"application/json", "application/xml"};
+        assertEquals(MediaType.parseMediaType("application/json"), apiClient.selectHeaderContentType(contentTypes));
+
+        contentTypes = new String[]{"APPLICATION/JSON", "APPLICATION/XML"};
+        assertEquals(MediaType.parseMediaType("APPLICATION/JSON"), apiClient.selectHeaderContentType(contentTypes));
+
+        contentTypes = new String[]{"application/xml", "application/json; charset=UTF8"};
+        assertEquals(MediaType.parseMediaType("application/json; charset=UTF8"), apiClient.selectHeaderContentType(contentTypes));
+
+        contentTypes = new String[]{"text/plain", "application/xml"};
+        assertEquals(MediaType.parseMediaType("text/plain"), apiClient.selectHeaderContentType(contentTypes));
+
+        contentTypes = new String[]{};
+        assertEquals(MediaType.parseMediaType("application/json"), apiClient.selectHeaderContentType(contentTypes));
+    }
+
+    @Test
+    public void testGetAuthentications() {
+        Map<String, Authentication> auths = apiClient.getAuthentications();
+
+        Authentication auth = auths.get("api_key");
+        assertNotNull(auth);
+        assertTrue(auth instanceof ApiKeyAuth);
+        ApiKeyAuth apiKeyAuth = (ApiKeyAuth) auth;
+        assertEquals("header", apiKeyAuth.getLocation());
+        assertEquals("api_key", apiKeyAuth.getParamName());
+
+        auth = auths.get("petstore_auth");
+        assertTrue(auth instanceof OAuth);
+        assertSame(auth, apiClient.getAuthentication("petstore_auth"));
+
+        assertNull(auths.get("unknown"));
+
+        try {
+            auths.put("my_auth", new HttpBasicAuth());
+            fail("the authentications returned should not be modifiable");
+        } catch (UnsupportedOperationException e) {
+        }
+    }
+
+    @Ignore("There is no more basic auth in petstore security definitions")
+    @Test
+    public void testSetUsernameAndPassword() {
+        HttpBasicAuth auth = null;
+        for (Authentication _auth : apiClient.getAuthentications().values()) {
+            if (_auth instanceof HttpBasicAuth) {
+                auth = (HttpBasicAuth) _auth;
+                break;
+            }
+        }
+        auth.setUsername(null);
+        auth.setPassword(null);
+
+        apiClient.setUsername("my-username");
+        apiClient.setPassword("my-password");
+        assertEquals("my-username", auth.getUsername());
+        assertEquals("my-password", auth.getPassword());
+
+        // reset values
+        auth.setUsername(null);
+        auth.setPassword(null);
+    }
+
+    @Test
+    public void testSetApiKeyAndPrefix() {
+        ApiKeyAuth auth = null;
+        for (Authentication _auth : apiClient.getAuthentications().values()) {
+            if (_auth instanceof ApiKeyAuth) {
+                auth = (ApiKeyAuth) _auth;
+                break;
+            }
+        }
+        auth.setApiKey(null);
+        auth.setApiKeyPrefix(null);
+
+        apiClient.setApiKey("my-api-key");
+        apiClient.setApiKeyPrefix("Token");
+        assertEquals("my-api-key", auth.getApiKey());
+        assertEquals("Token", auth.getApiKeyPrefix());
+
+        // reset values
+        auth.setApiKey(null);
+        auth.setApiKeyPrefix(null);
+    }
+
+    @Test
+    public void testParameterToMultiValueMapWhenNameIsInvalid() throws Exception {
+        MultiValueMap<String, String> pairs_a = apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.CSV, null, new Integer(1));
+        MultiValueMap<String, String> pairs_b = apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.CSV, "", new Integer(1));
+
+        assertTrue(pairs_a.isEmpty());
+        assertTrue(pairs_b.isEmpty());
+    }
+
+    @Test
+    public void testParameterToMultiValueMapWhenValueIsNull() throws Exception {
+        MultiValueMap<String, String> pairs = apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.CSV, "param-a", null);
+
+        assertTrue(pairs.isEmpty());
+    }
+
+    @Test
+    public void testParameterToMultiValueMapWhenValueIsEmptyStrings() throws Exception {
+
+        // single empty string
+        MultiValueMap<String, String> pairs = apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.CSV, "param-a", " ");
+        assertEquals(1, pairs.size());
+
+        // list of empty strings
+        List<String> strs = new ArrayList<String>();
+        strs.add(" ");
+        strs.add(" ");
+        strs.add(" ");
+
+        MultiValueMap<String, String> concatStrings = apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.CSV, "param-a", strs);
+
+        assertEquals(1, concatStrings.get("param-a").size());
+        assertFalse(concatStrings.get("param-a").isEmpty()); // should contain some delimiters
+    }
+
+    @Test
+    public void testParameterToMultiValueMapWhenValueIsNotCollection() throws Exception {
+        String name = "param-a";
+        Integer value = 1;
+
+        MultiValueMap<String, String> pairs = apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.CSV, name, value);
+
+        assertEquals(1, pairs.get(name).size());
+        assertEquals(value, Integer.valueOf(pairs.get(name).get(0)));
+    }
+
+    @Test
+    public void testParameterToMultiValueMapWhenValueIsCollection() throws Exception {
+        Map<ApiClient.CollectionFormat, String> collectionFormatMap = new HashMap<ApiClient.CollectionFormat, String>();
+        collectionFormatMap.put(ApiClient.CollectionFormat.CSV, ",");
+        collectionFormatMap.put(ApiClient.CollectionFormat.TSV, "\t");
+        collectionFormatMap.put(ApiClient.CollectionFormat.SSV, " ");
+        collectionFormatMap.put(ApiClient.CollectionFormat.PIPES, "\\|");
+        collectionFormatMap.put(null, ","); // no format, must default to csv
+
+        String name = "param-a";
+
+        List<Object> values = new ArrayList<Object>();
+        values.add("value-a");
+        values.add(123);
+        values.add(new Date());
+
+        // check for multi separately
+        MultiValueMap<String, String> multiValueMap = apiClient.parameterToMultiValueMap(ApiClient.CollectionFormat.MULTI, name, values);
+        assertEquals(values.size(), multiValueMap.get(name).size());
+
+        // all other formats
+        for (ApiClient.CollectionFormat collectionFormat : collectionFormatMap.keySet()) {
+            MultiValueMap<String, String> pairs = apiClient.parameterToMultiValueMap(collectionFormat, name, values);
+
+            assertEquals(1, pairs.size());
+
+            String delimiter = collectionFormatMap.get(collectionFormat);
+            String[] pairValueSplit = pairs.get(name).get(0).split(delimiter);
+
+            assertEquals(values.size(), pairValueSplit.length);
+        }
+    }
+}

samples/client/petstore/java/resttemplate/src/test/java/org/openapitools/client/auth/ApiKeyAuthTest.java

@@ -0,0 +1,47 @@
+package org.openapitools.client.auth;
+
+import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.List;
+
+import org.junit.*;
+import org.springframework.http.HttpHeaders;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+
+import static org.junit.Assert.*;
+
+public class ApiKeyAuthTest {
+    @Test
+    public void testApplyToParamsInQuery() {
+        MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
+        HttpHeaders headerParams = new HttpHeaders();
+
+        ApiKeyAuth auth = new ApiKeyAuth("query", "api_key");
+        auth.setApiKey("my-api-key");
+        auth.applyToParams(queryParams, headerParams);
+
+        assertEquals(1, queryParams.size());
+        assertEquals("my-api-key", queryParams.get("api_key").get(0));
+
+        // no changes to header parameters
+        assertEquals(0, headerParams.size());
+    }
+
+    @Test
+    public void testApplyToParamsInHeaderWithPrefix() {
+        MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
+        HttpHeaders headerParams = new HttpHeaders();
+
+        ApiKeyAuth auth = new ApiKeyAuth("header", "X-API-TOKEN");
+        auth.setApiKey("my-api-token");
+        auth.setApiKeyPrefix("Token");
+        auth.applyToParams(queryParams, headerParams);
+
+        // no changes to query parameters
+        assertEquals(0, queryParams.size());
+        assertEquals(1, headerParams.size());
+        assertEquals("Token my-api-token", headerParams.get("X-API-TOKEN").get(0));
+    }
+}

samples/client/petstore/java/resttemplate/src/test/java/org/openapitools/client/auth/HttpBasicAuthTest.java

@@ -0,0 +1,54 @@
+package org.openapitools.client.auth;
+
+import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.List;
+
+import org.junit.*;
+import org.springframework.http.HttpHeaders;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+
+import static org.junit.Assert.*;
+
+public class HttpBasicAuthTest {
+    HttpBasicAuth auth = null;
+
+    @Before
+    public void setup() {
+        auth = new HttpBasicAuth();
+    }
+
+    @Test
+    public void testApplyToParams() {
+        MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<String, String>();
+        HttpHeaders headerParams = new HttpHeaders();
+
+        auth.setUsername("my-username");
+        auth.setPassword("my-password");
+        auth.applyToParams(queryParams, headerParams);
+
+        // no changes to query parameters
+        assertEquals(0, queryParams.size());
+        assertEquals(1, headerParams.size());
+        // the string below is base64-encoded result of "my-username:my-password" with the "Basic " prefix
+        String expected = "Basic bXktdXNlcm5hbWU6bXktcGFzc3dvcmQ=";
+        assertEquals(expected, headerParams.get("Authorization").get(0));
+
+        // null username should be treated as empty string
+        auth.setUsername(null);
+        auth.applyToParams(queryParams, headerParams);
+        // the string below is base64-encoded result of ":my-password" with the "Basic " prefix
+        expected = "Basic Om15LXBhc3N3b3Jk";
+        assertEquals(expected, headerParams.get("Authorization").get(1));
+
+        // null password should be treated as empty string
+        auth.setUsername("my-username");
+        auth.setPassword(null);
+        auth.applyToParams(queryParams, headerParams);
+        // the string below is base64-encoded result of "my-username:" with the "Basic " prefix
+        expected = "Basic bXktdXNlcm5hbWU6";
+        assertEquals(expected, headerParams.get("Authorization").get(2));
+    }
+}

samples/client/petstore/java/resttemplate/src/test/java/org/openapitools/client/model/EnumValueTest.java

@@ -0,0 +1,63 @@
+package org.openapitools.client.model;
+
+import org.junit.Test;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectWriter;
+import com.fasterxml.jackson.databind.SerializationFeature;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+public class EnumValueTest {
+
+    @Test
+    public void testEnumClass() {
+        assertEquals(EnumClass._ABC.toString(), "_abc");
+        assertEquals(EnumClass._EFG.toString(), "-efg");
+        assertEquals(EnumClass._XYZ_.toString(), "(xyz)");
+    }
+
+    @Test
+    public void testEnumTest() {
+        // test enum value
+        EnumTest enumTest = new EnumTest();
+        enumTest.setEnumString(EnumTest.EnumStringEnum.LOWER);
+        enumTest.setEnumInteger(EnumTest.EnumIntegerEnum.NUMBER_1);
+        enumTest.setEnumNumber(EnumTest.EnumNumberEnum.NUMBER_1_DOT_1);
+
+        assertEquals(EnumTest.EnumStringEnum.UPPER.toString(), "UPPER");
+        assertEquals(EnumTest.EnumStringEnum.UPPER.getValue(), "UPPER");
+        assertEquals(EnumTest.EnumStringEnum.LOWER.toString(), "lower");
+        assertEquals(EnumTest.EnumStringEnum.LOWER.getValue(), "lower");
+
+        assertEquals(EnumTest.EnumIntegerEnum.NUMBER_1.toString(), "1");
+        assertTrue(EnumTest.EnumIntegerEnum.NUMBER_1.getValue() == 1);
+        assertEquals(EnumTest.EnumIntegerEnum.NUMBER_MINUS_1.toString(), "-1");
+        assertTrue(EnumTest.EnumIntegerEnum.NUMBER_MINUS_1.getValue() == -1);
+
+        assertEquals(EnumTest.EnumNumberEnum.NUMBER_1_DOT_1.toString(), "1.1");
+        assertTrue(EnumTest.EnumNumberEnum.NUMBER_1_DOT_1.getValue() == 1.1);
+        assertEquals(EnumTest.EnumNumberEnum.NUMBER_MINUS_1_DOT_2.toString(), "-1.2");
+        assertTrue(EnumTest.EnumNumberEnum.NUMBER_MINUS_1_DOT_2.getValue() == -1.2);
+
+        try {
+            // test serialization (object => json)
+            ObjectMapper mapper = new ObjectMapper();
+            mapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
+            ObjectWriter ow = mapper.writer();
+            String json = ow.writeValueAsString(enumTest);
+            assertEquals(json, "{\"enum_string\":\"lower\",\"enum_string_required\":null,\"enum_integer\":1,\"enum_number\":1.1,\"outerEnum\":null}");
+
+            // test deserialization (json => object)
+            EnumTest fromString = mapper.readValue(json, EnumTest.class);
+            assertEquals(fromString.getEnumString().toString(), "lower");
+            assertEquals(fromString.getEnumInteger().toString(), "1");
+            assertEquals(fromString.getEnumNumber().toString(), "1.1");
+
+        } catch (Exception e) {
+            fail("Exception thrown during serialization/deserialzation of JSON: " + e.getMessage());
+        }
+    }
+}

samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/MapTest.java

@@ -26,6 +26,7 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.openapitools.client.model.StringBooleanMap;
 
 /**
  * MapTest
@@ -87,6 +88,14 @@ public class MapTest {
   @SerializedName(SERIALIZED_NAME_MAP_OF_ENUM_STRING)
   private Map<String, InnerEnum> mapOfEnumString = null;
 
+  public static final String SERIALIZED_NAME_DIRECT_MAP = "direct_map";
+  @SerializedName(SERIALIZED_NAME_DIRECT_MAP)
+  private Map<String, Boolean> directMap = null;
+
+  public static final String SERIALIZED_NAME_INDIRECT_MAP = "indirect_map";
+  @SerializedName(SERIALIZED_NAME_INDIRECT_MAP)
+  private StringBooleanMap indirectMap = null;
+
   public MapTest mapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
     this.mapMapOfString = mapMapOfString;
     return this;
@@ -139,6 +148,50 @@ public class MapTest {
     this.mapOfEnumString = mapOfEnumString;
   }
 
+  public MapTest directMap(Map<String, Boolean> directMap) {
+    this.directMap = directMap;
+    return this;
+  }
+
+  public MapTest putDirectMapItem(String key, Boolean directMapItem) {
+    if (this.directMap == null) {
+      this.directMap = new HashMap<String, Boolean>();
+    }
+    this.directMap.put(key, directMapItem);
+    return this;
+  }
+
+   /**
+   * Get directMap
+   * @return directMap
+  **/
+  @ApiModelProperty(value = "")
+  public Map<String, Boolean> getDirectMap() {
+    return directMap;
+  }
+
+  public void setDirectMap(Map<String, Boolean> directMap) {
+    this.directMap = directMap;
+  }
+
+  public MapTest indirectMap(StringBooleanMap indirectMap) {
+    this.indirectMap = indirectMap;
+    return this;
+  }
+
+   /**
+   * Get indirectMap
+   * @return indirectMap
+  **/
+  @ApiModelProperty(value = "")
+  public StringBooleanMap getIndirectMap() {
+    return indirectMap;
+  }
+
+  public void setIndirectMap(StringBooleanMap indirectMap) {
+    this.indirectMap = indirectMap;
+  }
+
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -150,12 +203,14 @@ public class MapTest {
     }
     MapTest mapTest = (MapTest) o;
     return Objects.equals(this.mapMapOfString, mapTest.mapMapOfString) &&
-        Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString);
+        Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString) &&
+        Objects.equals(this.directMap, mapTest.directMap) &&
+        Objects.equals(this.indirectMap, mapTest.indirectMap);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(mapMapOfString, mapOfEnumString);
+    return Objects.hash(mapMapOfString, mapOfEnumString, directMap, indirectMap);
   }
 
 
@@ -166,6 +221,8 @@ public class MapTest {
     
     sb.append("    mapMapOfString: ").append(toIndentedString(mapMapOfString)).append("\n");
     sb.append("    mapOfEnumString: ").append(toIndentedString(mapOfEnumString)).append("\n");
+    sb.append("    directMap: ").append(toIndentedString(directMap)).append("\n");
+    sb.append("    indirectMap: ").append(toIndentedString(indirectMap)).append("\n");
     sb.append("}");
     return sb.toString();
   }

samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/OuterComposite.java

@@ -88,7 +88,7 @@ public class OuterComposite {
    * @return myBoolean
   **/
   @ApiModelProperty(value = "")
-  public Boolean getMyBoolean() {
+  public Boolean isMyBoolean() {
     return myBoolean;
   }
 

samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/StringBooleanMap.java

@@ -0,0 +1,65 @@
+/*
+ * OpenAPI 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
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * StringBooleanMap
+ */
+
+public class StringBooleanMap extends HashMap<String, Boolean> {
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    return super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class StringBooleanMap {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).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/retrofit2-play24/docs/MapTest.md

@@ -6,6 +6,8 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **mapMapOfString** | [**Map<String, Map<String, String>>**](Map.md) |  |  [optional]
 **mapOfEnumString** | [**Map<String, InnerEnum>**](#Map<String, InnerEnum>) |  |  [optional]
+**directMap** | **Map<String, Boolean>** |  |  [optional]
+**indirectMap** | [**StringBooleanMap**](StringBooleanMap.md) |  |  [optional]
 
 
 <a name="Map<String, InnerEnum>"></a>

samples/client/petstore/java/retrofit2-play24/docs/StringBooleanMap.md

@@ -0,0 +1,9 @@
+
+# StringBooleanMap
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+
+

samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/MapTest.java

@@ -23,6 +23,7 @@ import io.swagger.annotations.ApiModelProperty;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.openapitools.client.model.StringBooleanMap;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 
@@ -72,6 +73,12 @@ public class MapTest {
   @JsonProperty("map_of_enum_string")
   private Map<String, InnerEnum> mapOfEnumString = null;
 
+  @JsonProperty("direct_map")
+  private Map<String, Boolean> directMap = null;
+
+  @JsonProperty("indirect_map")
+  private StringBooleanMap indirectMap = null;
+
   public MapTest mapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
     this.mapMapOfString = mapMapOfString;
     return this;
@@ -125,6 +132,51 @@ public class MapTest {
     this.mapOfEnumString = mapOfEnumString;
   }
 
+  public MapTest directMap(Map<String, Boolean> directMap) {
+    this.directMap = directMap;
+    return this;
+  }
+
+  public MapTest putDirectMapItem(String key, Boolean directMapItem) {
+    if (this.directMap == null) {
+      this.directMap = new HashMap<>();
+    }
+    this.directMap.put(key, directMapItem);
+    return this;
+  }
+
+   /**
+   * Get directMap
+   * @return directMap
+  **/
+  @ApiModelProperty(value = "")
+  public Map<String, Boolean> getDirectMap() {
+    return directMap;
+  }
+
+  public void setDirectMap(Map<String, Boolean> directMap) {
+    this.directMap = directMap;
+  }
+
+  public MapTest indirectMap(StringBooleanMap indirectMap) {
+    this.indirectMap = indirectMap;
+    return this;
+  }
+
+   /**
+   * Get indirectMap
+   * @return indirectMap
+  **/
+  @Valid
+  @ApiModelProperty(value = "")
+  public StringBooleanMap getIndirectMap() {
+    return indirectMap;
+  }
+
+  public void setIndirectMap(StringBooleanMap indirectMap) {
+    this.indirectMap = indirectMap;
+  }
+
 
   @Override
   public boolean equals(java.lang.Object o) {
@@ -136,12 +188,14 @@ public class MapTest {
     }
     MapTest mapTest = (MapTest) o;
     return Objects.equals(this.mapMapOfString, mapTest.mapMapOfString) &&
-        Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString);
+        Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString) &&
+        Objects.equals(this.directMap, mapTest.directMap) &&
+        Objects.equals(this.indirectMap, mapTest.indirectMap);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(mapMapOfString, mapOfEnumString);
+    return Objects.hash(mapMapOfString, mapOfEnumString, directMap, indirectMap);
   }
 
 
@@ -152,6 +206,8 @@ public class MapTest {
     
     sb.append("    mapMapOfString: ").append(toIndentedString(mapMapOfString)).append("\n");
     sb.append("    mapOfEnumString: ").append(toIndentedString(mapOfEnumString)).append("\n");
+    sb.append("    directMap: ").append(toIndentedString(directMap)).append("\n");
+    sb.append("    indirectMap: ").append(toIndentedString(indirectMap)).append("\n");
     sb.append("}");
     return sb.toString();
   }

samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/OuterComposite.java

@@ -85,7 +85,7 @@ public class OuterComposite {
    * @return myBoolean
   **/
   @ApiModelProperty(value = "")
-  public Boolean getMyBoolean() {
+  public Boolean isMyBoolean() {
     return myBoolean;
   }
 

samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/StringBooleanMap.java

@@ -0,0 +1,67 @@
+/*
+ * OpenAPI 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
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import javax.validation.constraints.*;
+import javax.validation.Valid;
+
+/**
+ * StringBooleanMap
+ */
+
+public class StringBooleanMap extends HashMap<String, Boolean> {
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    return super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class StringBooleanMap {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).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    ");
+  }
+
+}
+