diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache
index 10a66d7538b2..c72fc521b76d 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache
@@ -278,7 +278,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
    * <p>Setter for the field <code>httpClient</code>.</p>
    *
    * @param httpClient a {@link {{javaxPackage}}.ws.rs.client.Client} object.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setHttpClient(Client httpClient) {
     this.httpClient = httpClient;
@@ -298,7 +298,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
    * Sets the base URL to the location where the OpenAPI document is being served.
    *
    * @param basePath The base URL to the target host.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setBasePath(String basePath) {
     this.basePath = basePath;
@@ -321,7 +321,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
    * <p>Setter for the field <code>servers</code>.</p>
    *
    * @param servers a {@link java.util.List} of servers.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setServers(List<ServerConfiguration> servers) {
     this.servers = servers;
@@ -342,7 +342,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
    * <p>Setter for the field <code>serverIndex</code>.</p>
    *
    * @param serverIndex the server index
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setServerIndex(Integer serverIndex) {
     this.serverIndex = serverIndex;
@@ -363,7 +363,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
    * <p>Setter for the field <code>serverVariables</code>.</p>
    *
    * @param serverVariables a {@link java.util.Map} of server variables.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setServerVariables(Map<String, String> serverVariables) {
     this.serverVariables = serverVariables;
@@ -410,7 +410,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
    * Helper method to set username for the first HTTP basic authentication.
    *
    * @param username Username
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setUsername(String username) {
     for (Authentication auth : authentications.values()) {
@@ -426,7 +426,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
    * Helper method to set password for the first HTTP basic authentication.
    *
    * @param password Password
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setPassword(String password) {
     for (Authentication auth : authentications.values()) {
@@ -442,7 +442,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
    * Helper method to set API key value for the first API key authentication.
    *
    * @param apiKey API key
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setApiKey(String apiKey) {
     for (Authentication auth : authentications.values()) {
@@ -458,7 +458,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
    * Helper method to configure authentications which respects aliases of API keys.
    *
    * @param secrets Hash map from authentication name to its secret.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient configureApiKeys(Map<String, String> secrets) {
     for (Map.Entry<String, Authentication> authEntry : authentications.entrySet()) {
@@ -480,7 +480,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
    * Helper method to set API key prefix for the first API key authentication.
    *
    * @param apiKeyPrefix API key prefix
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setApiKeyPrefix(String apiKeyPrefix) {
     for (Authentication auth : authentications.values()) {
@@ -496,7 +496,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
    * Helper method to set bearer token for the first Bearer authentication.
    *
    * @param bearerToken Bearer token
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setBearerToken(String bearerToken) {
     for (Authentication auth : authentications.values()) {
@@ -513,7 +513,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
    * Helper method to set access token for the first OAuth2 authentication.
    *
    * @param accessToken Access token
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setAccessToken(String accessToken) {
     for (Authentication auth : authentications.values()) {
@@ -530,7 +530,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
    *
    * @param clientId the client ID
    * @param clientSecret the client secret
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setOauthCredentials(String clientId, String clientSecret) {
     for (Authentication auth : authentications.values()) {
@@ -546,7 +546,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
    * Helper method to set the credentials of a public client for the first OAuth2 authentication.
    *
    * @param clientId the client ID
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setOauthCredentialsForPublicClient(String clientId) {
     for (Authentication auth : authentications.values()) {
@@ -563,7 +563,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
    *
    * @param username the user name
    * @param password the user password
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setOauthPasswordFlow(String username, String password) {
     for (Authentication auth : authentications.values()) {
@@ -579,7 +579,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
    * Helper method to set the authorization code flow for the first OAuth2 authentication.
    *
    * @param code the authorization code
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setOauthAuthorizationCodeFlow(String code) {
     for (Authentication auth : authentications.values()) {
@@ -595,7 +595,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
    * Helper method to set the scopes for the first OAuth2 authentication.
    *
    * @param scope the oauth scope
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setOauthScope(String scope) {
     for (Authentication auth : authentications.values()) {
@@ -612,7 +612,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
    * Set the User-Agent header's value (by adding to the default header map).
    *
    * @param userAgent Http user agent
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setUserAgent(String userAgent) {
     this.userAgent = userAgent;
@@ -634,7 +634,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
    *
    * @param key The header's key
    * @param value The header's value
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient addDefaultHeader(String key, String value) {
     defaultHeaderMap.put(key, value);
@@ -646,7 +646,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
    *
    * @param key The cookie's key
    * @param value The cookie's value
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient addDefaultCookie(String key, String value) {
     defaultCookieMap.put(key, value);
@@ -666,7 +666,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
    * Set the client config.
    *
    * @param clientConfig Set the client config
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setClientConfig(ClientConfig clientConfig) {
     this.clientConfig = clientConfig;
@@ -688,7 +688,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
    * Enable/disable debugging for this API client.
    *
    * @param debugging To enable (true) or disable (false) debugging
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setDebugging(boolean debugging) {
     this.debugging = debugging;
@@ -712,7 +712,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
    * Set temp folder path
    *
    * @param tempFolderPath Temp folder path
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setTempFolderPath(String tempFolderPath) {
     this.tempFolderPath = tempFolderPath;
@@ -734,7 +734,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
    * {@link Integer#MAX_VALUE}.
    *
    * @param connectionTimeout Connection timeout in milliseconds
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setConnectTimeout(int connectionTimeout) {
     this.connectionTimeout = connectionTimeout;
@@ -757,7 +757,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
    * {@link Integer#MAX_VALUE}.
    *
    * @param readTimeout Read timeout in milliseconds
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setReadTimeout(int readTimeout) {
     this.readTimeout = readTimeout;
@@ -778,7 +778,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
    * Set the date format used to parse/format date parameters.
    *
    * @param dateFormat Date format
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setDateFormat(DateFormat dateFormat) {
     this.dateFormat = dateFormat;
diff --git a/samples/client/others/java/jersey2-oneOf-Mixed/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/others/java/jersey2-oneOf-Mixed/src/main/java/org/openapitools/client/ApiClient.java
index e77ed7e20e0b..5ae6fc2b4872 100644
--- a/samples/client/others/java/jersey2-oneOf-Mixed/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/others/java/jersey2-oneOf-Mixed/src/main/java/org/openapitools/client/ApiClient.java
@@ -159,7 +159,7 @@ public Client getHttpClient() {
    * <p>Setter for the field <code>httpClient</code>.</p>
    *
    * @param httpClient a {@link javax.ws.rs.client.Client} object.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setHttpClient(Client httpClient) {
     this.httpClient = httpClient;
@@ -179,7 +179,7 @@ public String getBasePath() {
    * Sets the base URL to the location where the OpenAPI document is being served.
    *
    * @param basePath The base URL to the target host.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setBasePath(String basePath) {
     this.basePath = basePath;
@@ -199,7 +199,7 @@ public List<ServerConfiguration> getServers() {
    * <p>Setter for the field <code>servers</code>.</p>
    *
    * @param servers a {@link java.util.List} of servers.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setServers(List<ServerConfiguration> servers) {
     this.servers = servers;
@@ -220,7 +220,7 @@ public Integer getServerIndex() {
    * <p>Setter for the field <code>serverIndex</code>.</p>
    *
    * @param serverIndex the server index
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setServerIndex(Integer serverIndex) {
     this.serverIndex = serverIndex;
@@ -241,7 +241,7 @@ public Map<String, String> getServerVariables() {
    * <p>Setter for the field <code>serverVariables</code>.</p>
    *
    * @param serverVariables a {@link java.util.Map} of server variables.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setServerVariables(Map<String, String> serverVariables) {
     this.serverVariables = serverVariables;
@@ -278,7 +278,7 @@ public Authentication getAuthentication(String authName) {
    * Helper method to set username for the first HTTP basic authentication.
    *
    * @param username Username
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setUsername(String username) {
     for (Authentication auth : authentications.values()) {
@@ -294,7 +294,7 @@ public ApiClient setUsername(String username) {
    * Helper method to set password for the first HTTP basic authentication.
    *
    * @param password Password
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setPassword(String password) {
     for (Authentication auth : authentications.values()) {
@@ -310,7 +310,7 @@ public ApiClient setPassword(String password) {
    * Helper method to set API key value for the first API key authentication.
    *
    * @param apiKey API key
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setApiKey(String apiKey) {
     for (Authentication auth : authentications.values()) {
@@ -326,7 +326,7 @@ public ApiClient setApiKey(String apiKey) {
    * Helper method to configure authentications which respects aliases of API keys.
    *
    * @param secrets Hash map from authentication name to its secret.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient configureApiKeys(Map<String, String> secrets) {
     for (Map.Entry<String, Authentication> authEntry : authentications.entrySet()) {
@@ -348,7 +348,7 @@ public ApiClient configureApiKeys(Map<String, String> secrets) {
    * Helper method to set API key prefix for the first API key authentication.
    *
    * @param apiKeyPrefix API key prefix
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setApiKeyPrefix(String apiKeyPrefix) {
     for (Authentication auth : authentications.values()) {
@@ -364,7 +364,7 @@ public ApiClient setApiKeyPrefix(String apiKeyPrefix) {
    * Helper method to set bearer token for the first Bearer authentication.
    *
    * @param bearerToken Bearer token
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setBearerToken(String bearerToken) {
     for (Authentication auth : authentications.values()) {
@@ -380,7 +380,7 @@ public ApiClient setBearerToken(String bearerToken) {
    * Set the User-Agent header's value (by adding to the default header map).
    *
    * @param userAgent Http user agent
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setUserAgent(String userAgent) {
     this.userAgent = userAgent;
@@ -402,7 +402,7 @@ public String getUserAgent(){
    *
    * @param key The header's key
    * @param value The header's value
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient addDefaultHeader(String key, String value) {
     defaultHeaderMap.put(key, value);
@@ -414,7 +414,7 @@ public ApiClient addDefaultHeader(String key, String value) {
    *
    * @param key The cookie's key
    * @param value The cookie's value
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient addDefaultCookie(String key, String value) {
     defaultCookieMap.put(key, value);
@@ -434,7 +434,7 @@ public ClientConfig getClientConfig() {
    * Set the client config.
    *
    * @param clientConfig Set the client config
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setClientConfig(ClientConfig clientConfig) {
     this.clientConfig = clientConfig;
@@ -456,7 +456,7 @@ public boolean isDebugging() {
    * Enable/disable debugging for this API client.
    *
    * @param debugging To enable (true) or disable (false) debugging
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setDebugging(boolean debugging) {
     this.debugging = debugging;
@@ -480,7 +480,7 @@ public String getTempFolderPath() {
    * Set temp folder path
    *
    * @param tempFolderPath Temp folder path
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setTempFolderPath(String tempFolderPath) {
     this.tempFolderPath = tempFolderPath;
@@ -502,7 +502,7 @@ public int getConnectTimeout() {
    * {@link Integer#MAX_VALUE}.
    *
    * @param connectionTimeout Connection timeout in milliseconds
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setConnectTimeout(int connectionTimeout) {
     this.connectionTimeout = connectionTimeout;
@@ -525,7 +525,7 @@ public int getReadTimeout() {
    * {@link Integer#MAX_VALUE}.
    *
    * @param readTimeout Read timeout in milliseconds
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setReadTimeout(int readTimeout) {
     this.readTimeout = readTimeout;
@@ -546,7 +546,7 @@ public DateFormat getDateFormat() {
    * Set the date format used to parse/format date parameters.
    *
    * @param dateFormat Date format
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setDateFormat(DateFormat dateFormat) {
     this.dateFormat = dateFormat;
diff --git a/samples/client/others/java/jersey2-oneOf-duplicates/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/others/java/jersey2-oneOf-duplicates/src/main/java/org/openapitools/client/ApiClient.java
index e77ed7e20e0b..5ae6fc2b4872 100644
--- a/samples/client/others/java/jersey2-oneOf-duplicates/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/others/java/jersey2-oneOf-duplicates/src/main/java/org/openapitools/client/ApiClient.java
@@ -159,7 +159,7 @@ public Client getHttpClient() {
    * <p>Setter for the field <code>httpClient</code>.</p>
    *
    * @param httpClient a {@link javax.ws.rs.client.Client} object.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setHttpClient(Client httpClient) {
     this.httpClient = httpClient;
@@ -179,7 +179,7 @@ public String getBasePath() {
    * Sets the base URL to the location where the OpenAPI document is being served.
    *
    * @param basePath The base URL to the target host.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setBasePath(String basePath) {
     this.basePath = basePath;
@@ -199,7 +199,7 @@ public List<ServerConfiguration> getServers() {
    * <p>Setter for the field <code>servers</code>.</p>
    *
    * @param servers a {@link java.util.List} of servers.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setServers(List<ServerConfiguration> servers) {
     this.servers = servers;
@@ -220,7 +220,7 @@ public Integer getServerIndex() {
    * <p>Setter for the field <code>serverIndex</code>.</p>
    *
    * @param serverIndex the server index
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setServerIndex(Integer serverIndex) {
     this.serverIndex = serverIndex;
@@ -241,7 +241,7 @@ public Map<String, String> getServerVariables() {
    * <p>Setter for the field <code>serverVariables</code>.</p>
    *
    * @param serverVariables a {@link java.util.Map} of server variables.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setServerVariables(Map<String, String> serverVariables) {
     this.serverVariables = serverVariables;
@@ -278,7 +278,7 @@ public Authentication getAuthentication(String authName) {
    * Helper method to set username for the first HTTP basic authentication.
    *
    * @param username Username
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setUsername(String username) {
     for (Authentication auth : authentications.values()) {
@@ -294,7 +294,7 @@ public ApiClient setUsername(String username) {
    * Helper method to set password for the first HTTP basic authentication.
    *
    * @param password Password
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setPassword(String password) {
     for (Authentication auth : authentications.values()) {
@@ -310,7 +310,7 @@ public ApiClient setPassword(String password) {
    * Helper method to set API key value for the first API key authentication.
    *
    * @param apiKey API key
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setApiKey(String apiKey) {
     for (Authentication auth : authentications.values()) {
@@ -326,7 +326,7 @@ public ApiClient setApiKey(String apiKey) {
    * Helper method to configure authentications which respects aliases of API keys.
    *
    * @param secrets Hash map from authentication name to its secret.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient configureApiKeys(Map<String, String> secrets) {
     for (Map.Entry<String, Authentication> authEntry : authentications.entrySet()) {
@@ -348,7 +348,7 @@ public ApiClient configureApiKeys(Map<String, String> secrets) {
    * Helper method to set API key prefix for the first API key authentication.
    *
    * @param apiKeyPrefix API key prefix
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setApiKeyPrefix(String apiKeyPrefix) {
     for (Authentication auth : authentications.values()) {
@@ -364,7 +364,7 @@ public ApiClient setApiKeyPrefix(String apiKeyPrefix) {
    * Helper method to set bearer token for the first Bearer authentication.
    *
    * @param bearerToken Bearer token
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setBearerToken(String bearerToken) {
     for (Authentication auth : authentications.values()) {
@@ -380,7 +380,7 @@ public ApiClient setBearerToken(String bearerToken) {
    * Set the User-Agent header's value (by adding to the default header map).
    *
    * @param userAgent Http user agent
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setUserAgent(String userAgent) {
     this.userAgent = userAgent;
@@ -402,7 +402,7 @@ public String getUserAgent(){
    *
    * @param key The header's key
    * @param value The header's value
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient addDefaultHeader(String key, String value) {
     defaultHeaderMap.put(key, value);
@@ -414,7 +414,7 @@ public ApiClient addDefaultHeader(String key, String value) {
    *
    * @param key The cookie's key
    * @param value The cookie's value
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient addDefaultCookie(String key, String value) {
     defaultCookieMap.put(key, value);
@@ -434,7 +434,7 @@ public ClientConfig getClientConfig() {
    * Set the client config.
    *
    * @param clientConfig Set the client config
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setClientConfig(ClientConfig clientConfig) {
     this.clientConfig = clientConfig;
@@ -456,7 +456,7 @@ public boolean isDebugging() {
    * Enable/disable debugging for this API client.
    *
    * @param debugging To enable (true) or disable (false) debugging
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setDebugging(boolean debugging) {
     this.debugging = debugging;
@@ -480,7 +480,7 @@ public String getTempFolderPath() {
    * Set temp folder path
    *
    * @param tempFolderPath Temp folder path
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setTempFolderPath(String tempFolderPath) {
     this.tempFolderPath = tempFolderPath;
@@ -502,7 +502,7 @@ public int getConnectTimeout() {
    * {@link Integer#MAX_VALUE}.
    *
    * @param connectionTimeout Connection timeout in milliseconds
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setConnectTimeout(int connectionTimeout) {
     this.connectionTimeout = connectionTimeout;
@@ -525,7 +525,7 @@ public int getReadTimeout() {
    * {@link Integer#MAX_VALUE}.
    *
    * @param readTimeout Read timeout in milliseconds
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setReadTimeout(int readTimeout) {
     this.readTimeout = readTimeout;
@@ -546,7 +546,7 @@ public DateFormat getDateFormat() {
    * Set the date format used to parse/format date parameters.
    *
    * @param dateFormat Date format
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setDateFormat(DateFormat dateFormat) {
     this.dateFormat = dateFormat;
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/ApiClient.java
index 857d4d668a1f..474aac64f4d9 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/ApiClient.java
@@ -193,7 +193,7 @@ public Client getHttpClient() {
    * <p>Setter for the field <code>httpClient</code>.</p>
    *
    * @param httpClient a {@link javax.ws.rs.client.Client} object.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setHttpClient(Client httpClient) {
     this.httpClient = httpClient;
@@ -213,7 +213,7 @@ public String getBasePath() {
    * Sets the base URL to the location where the OpenAPI document is being served.
    *
    * @param basePath The base URL to the target host.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setBasePath(String basePath) {
     this.basePath = basePath;
@@ -234,7 +234,7 @@ public List<ServerConfiguration> getServers() {
    * <p>Setter for the field <code>servers</code>.</p>
    *
    * @param servers a {@link java.util.List} of servers.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setServers(List<ServerConfiguration> servers) {
     this.servers = servers;
@@ -255,7 +255,7 @@ public Integer getServerIndex() {
    * <p>Setter for the field <code>serverIndex</code>.</p>
    *
    * @param serverIndex the server index
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setServerIndex(Integer serverIndex) {
     this.serverIndex = serverIndex;
@@ -276,7 +276,7 @@ public Map<String, String> getServerVariables() {
    * <p>Setter for the field <code>serverVariables</code>.</p>
    *
    * @param serverVariables a {@link java.util.Map} of server variables.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setServerVariables(Map<String, String> serverVariables) {
     this.serverVariables = serverVariables;
@@ -321,7 +321,7 @@ public Authentication getAuthentication(String authName) {
    * Helper method to set username for the first HTTP basic authentication.
    *
    * @param username Username
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setUsername(String username) {
     for (Authentication auth : authentications.values()) {
@@ -337,7 +337,7 @@ public ApiClient setUsername(String username) {
    * Helper method to set password for the first HTTP basic authentication.
    *
    * @param password Password
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setPassword(String password) {
     for (Authentication auth : authentications.values()) {
@@ -353,7 +353,7 @@ public ApiClient setPassword(String password) {
    * Helper method to set API key value for the first API key authentication.
    *
    * @param apiKey API key
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setApiKey(String apiKey) {
     for (Authentication auth : authentications.values()) {
@@ -369,7 +369,7 @@ public ApiClient setApiKey(String apiKey) {
    * Helper method to configure authentications which respects aliases of API keys.
    *
    * @param secrets Hash map from authentication name to its secret.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient configureApiKeys(Map<String, String> secrets) {
     for (Map.Entry<String, Authentication> authEntry : authentications.entrySet()) {
@@ -391,7 +391,7 @@ public ApiClient configureApiKeys(Map<String, String> secrets) {
    * Helper method to set API key prefix for the first API key authentication.
    *
    * @param apiKeyPrefix API key prefix
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setApiKeyPrefix(String apiKeyPrefix) {
     for (Authentication auth : authentications.values()) {
@@ -407,7 +407,7 @@ public ApiClient setApiKeyPrefix(String apiKeyPrefix) {
    * Helper method to set bearer token for the first Bearer authentication.
    *
    * @param bearerToken Bearer token
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setBearerToken(String bearerToken) {
     for (Authentication auth : authentications.values()) {
@@ -423,7 +423,7 @@ public ApiClient setBearerToken(String bearerToken) {
    * Helper method to set access token for the first OAuth2 authentication.
    *
    * @param accessToken Access token
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setAccessToken(String accessToken) {
     for (Authentication auth : authentications.values()) {
@@ -440,7 +440,7 @@ public ApiClient setAccessToken(String accessToken) {
    *
    * @param clientId the client ID
    * @param clientSecret the client secret
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setOauthCredentials(String clientId, String clientSecret) {
     for (Authentication auth : authentications.values()) {
@@ -456,7 +456,7 @@ public ApiClient setOauthCredentials(String clientId, String clientSecret) {
    * Helper method to set the credentials of a public client for the first OAuth2 authentication.
    *
    * @param clientId the client ID
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setOauthCredentialsForPublicClient(String clientId) {
     for (Authentication auth : authentications.values()) {
@@ -473,7 +473,7 @@ public ApiClient setOauthCredentialsForPublicClient(String clientId) {
    *
    * @param username the user name
    * @param password the user password
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setOauthPasswordFlow(String username, String password) {
     for (Authentication auth : authentications.values()) {
@@ -489,7 +489,7 @@ public ApiClient setOauthPasswordFlow(String username, String password) {
    * Helper method to set the authorization code flow for the first OAuth2 authentication.
    *
    * @param code the authorization code
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setOauthAuthorizationCodeFlow(String code) {
     for (Authentication auth : authentications.values()) {
@@ -505,7 +505,7 @@ public ApiClient setOauthAuthorizationCodeFlow(String code) {
    * Helper method to set the scopes for the first OAuth2 authentication.
    *
    * @param scope the oauth scope
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setOauthScope(String scope) {
     for (Authentication auth : authentications.values()) {
@@ -521,7 +521,7 @@ public ApiClient setOauthScope(String scope) {
    * Set the User-Agent header's value (by adding to the default header map).
    *
    * @param userAgent Http user agent
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setUserAgent(String userAgent) {
     this.userAgent = userAgent;
@@ -543,7 +543,7 @@ public String getUserAgent(){
    *
    * @param key The header's key
    * @param value The header's value
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient addDefaultHeader(String key, String value) {
     defaultHeaderMap.put(key, value);
@@ -555,7 +555,7 @@ public ApiClient addDefaultHeader(String key, String value) {
    *
    * @param key The cookie's key
    * @param value The cookie's value
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient addDefaultCookie(String key, String value) {
     defaultCookieMap.put(key, value);
@@ -575,7 +575,7 @@ public ClientConfig getClientConfig() {
    * Set the client config.
    *
    * @param clientConfig Set the client config
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setClientConfig(ClientConfig clientConfig) {
     this.clientConfig = clientConfig;
@@ -597,7 +597,7 @@ public boolean isDebugging() {
    * Enable/disable debugging for this API client.
    *
    * @param debugging To enable (true) or disable (false) debugging
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setDebugging(boolean debugging) {
     this.debugging = debugging;
@@ -621,7 +621,7 @@ public String getTempFolderPath() {
    * Set temp folder path
    *
    * @param tempFolderPath Temp folder path
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setTempFolderPath(String tempFolderPath) {
     this.tempFolderPath = tempFolderPath;
@@ -643,7 +643,7 @@ public int getConnectTimeout() {
    * {@link Integer#MAX_VALUE}.
    *
    * @param connectionTimeout Connection timeout in milliseconds
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setConnectTimeout(int connectionTimeout) {
     this.connectionTimeout = connectionTimeout;
@@ -666,7 +666,7 @@ public int getReadTimeout() {
    * {@link Integer#MAX_VALUE}.
    *
    * @param readTimeout Read timeout in milliseconds
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setReadTimeout(int readTimeout) {
     this.readTimeout = readTimeout;
@@ -687,7 +687,7 @@ public DateFormat getDateFormat() {
    * Set the date format used to parse/format date parameters.
    *
    * @param dateFormat Date format
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setDateFormat(DateFormat dateFormat) {
     this.dateFormat = dateFormat;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
index 857d4d668a1f..474aac64f4d9 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
@@ -193,7 +193,7 @@ public Client getHttpClient() {
    * <p>Setter for the field <code>httpClient</code>.</p>
    *
    * @param httpClient a {@link javax.ws.rs.client.Client} object.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setHttpClient(Client httpClient) {
     this.httpClient = httpClient;
@@ -213,7 +213,7 @@ public String getBasePath() {
    * Sets the base URL to the location where the OpenAPI document is being served.
    *
    * @param basePath The base URL to the target host.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setBasePath(String basePath) {
     this.basePath = basePath;
@@ -234,7 +234,7 @@ public List<ServerConfiguration> getServers() {
    * <p>Setter for the field <code>servers</code>.</p>
    *
    * @param servers a {@link java.util.List} of servers.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setServers(List<ServerConfiguration> servers) {
     this.servers = servers;
@@ -255,7 +255,7 @@ public Integer getServerIndex() {
    * <p>Setter for the field <code>serverIndex</code>.</p>
    *
    * @param serverIndex the server index
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setServerIndex(Integer serverIndex) {
     this.serverIndex = serverIndex;
@@ -276,7 +276,7 @@ public Map<String, String> getServerVariables() {
    * <p>Setter for the field <code>serverVariables</code>.</p>
    *
    * @param serverVariables a {@link java.util.Map} of server variables.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setServerVariables(Map<String, String> serverVariables) {
     this.serverVariables = serverVariables;
@@ -321,7 +321,7 @@ public Authentication getAuthentication(String authName) {
    * Helper method to set username for the first HTTP basic authentication.
    *
    * @param username Username
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setUsername(String username) {
     for (Authentication auth : authentications.values()) {
@@ -337,7 +337,7 @@ public ApiClient setUsername(String username) {
    * Helper method to set password for the first HTTP basic authentication.
    *
    * @param password Password
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setPassword(String password) {
     for (Authentication auth : authentications.values()) {
@@ -353,7 +353,7 @@ public ApiClient setPassword(String password) {
    * Helper method to set API key value for the first API key authentication.
    *
    * @param apiKey API key
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setApiKey(String apiKey) {
     for (Authentication auth : authentications.values()) {
@@ -369,7 +369,7 @@ public ApiClient setApiKey(String apiKey) {
    * Helper method to configure authentications which respects aliases of API keys.
    *
    * @param secrets Hash map from authentication name to its secret.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient configureApiKeys(Map<String, String> secrets) {
     for (Map.Entry<String, Authentication> authEntry : authentications.entrySet()) {
@@ -391,7 +391,7 @@ public ApiClient configureApiKeys(Map<String, String> secrets) {
    * Helper method to set API key prefix for the first API key authentication.
    *
    * @param apiKeyPrefix API key prefix
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setApiKeyPrefix(String apiKeyPrefix) {
     for (Authentication auth : authentications.values()) {
@@ -407,7 +407,7 @@ public ApiClient setApiKeyPrefix(String apiKeyPrefix) {
    * Helper method to set bearer token for the first Bearer authentication.
    *
    * @param bearerToken Bearer token
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setBearerToken(String bearerToken) {
     for (Authentication auth : authentications.values()) {
@@ -423,7 +423,7 @@ public ApiClient setBearerToken(String bearerToken) {
    * Helper method to set access token for the first OAuth2 authentication.
    *
    * @param accessToken Access token
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setAccessToken(String accessToken) {
     for (Authentication auth : authentications.values()) {
@@ -440,7 +440,7 @@ public ApiClient setAccessToken(String accessToken) {
    *
    * @param clientId the client ID
    * @param clientSecret the client secret
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setOauthCredentials(String clientId, String clientSecret) {
     for (Authentication auth : authentications.values()) {
@@ -456,7 +456,7 @@ public ApiClient setOauthCredentials(String clientId, String clientSecret) {
    * Helper method to set the credentials of a public client for the first OAuth2 authentication.
    *
    * @param clientId the client ID
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setOauthCredentialsForPublicClient(String clientId) {
     for (Authentication auth : authentications.values()) {
@@ -473,7 +473,7 @@ public ApiClient setOauthCredentialsForPublicClient(String clientId) {
    *
    * @param username the user name
    * @param password the user password
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setOauthPasswordFlow(String username, String password) {
     for (Authentication auth : authentications.values()) {
@@ -489,7 +489,7 @@ public ApiClient setOauthPasswordFlow(String username, String password) {
    * Helper method to set the authorization code flow for the first OAuth2 authentication.
    *
    * @param code the authorization code
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setOauthAuthorizationCodeFlow(String code) {
     for (Authentication auth : authentications.values()) {
@@ -505,7 +505,7 @@ public ApiClient setOauthAuthorizationCodeFlow(String code) {
    * Helper method to set the scopes for the first OAuth2 authentication.
    *
    * @param scope the oauth scope
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setOauthScope(String scope) {
     for (Authentication auth : authentications.values()) {
@@ -521,7 +521,7 @@ public ApiClient setOauthScope(String scope) {
    * Set the User-Agent header's value (by adding to the default header map).
    *
    * @param userAgent Http user agent
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setUserAgent(String userAgent) {
     this.userAgent = userAgent;
@@ -543,7 +543,7 @@ public String getUserAgent(){
    *
    * @param key The header's key
    * @param value The header's value
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient addDefaultHeader(String key, String value) {
     defaultHeaderMap.put(key, value);
@@ -555,7 +555,7 @@ public ApiClient addDefaultHeader(String key, String value) {
    *
    * @param key The cookie's key
    * @param value The cookie's value
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient addDefaultCookie(String key, String value) {
     defaultCookieMap.put(key, value);
@@ -575,7 +575,7 @@ public ClientConfig getClientConfig() {
    * Set the client config.
    *
    * @param clientConfig Set the client config
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setClientConfig(ClientConfig clientConfig) {
     this.clientConfig = clientConfig;
@@ -597,7 +597,7 @@ public boolean isDebugging() {
    * Enable/disable debugging for this API client.
    *
    * @param debugging To enable (true) or disable (false) debugging
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setDebugging(boolean debugging) {
     this.debugging = debugging;
@@ -621,7 +621,7 @@ public String getTempFolderPath() {
    * Set temp folder path
    *
    * @param tempFolderPath Temp folder path
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setTempFolderPath(String tempFolderPath) {
     this.tempFolderPath = tempFolderPath;
@@ -643,7 +643,7 @@ public int getConnectTimeout() {
    * {@link Integer#MAX_VALUE}.
    *
    * @param connectionTimeout Connection timeout in milliseconds
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setConnectTimeout(int connectionTimeout) {
     this.connectionTimeout = connectionTimeout;
@@ -666,7 +666,7 @@ public int getReadTimeout() {
    * {@link Integer#MAX_VALUE}.
    *
    * @param readTimeout Read timeout in milliseconds
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setReadTimeout(int readTimeout) {
     this.readTimeout = readTimeout;
@@ -687,7 +687,7 @@ public DateFormat getDateFormat() {
    * Set the date format used to parse/format date parameters.
    *
    * @param dateFormat Date format
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setDateFormat(DateFormat dateFormat) {
     this.dateFormat = dateFormat;
diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java b/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
index 59c5a4721c25..801f0425adbe 100644
--- a/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
@@ -208,7 +208,7 @@ public Client getHttpClient() {
    * <p>Setter for the field <code>httpClient</code>.</p>
    *
    * @param httpClient a {@link javax.ws.rs.client.Client} object.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setHttpClient(Client httpClient) {
     this.httpClient = httpClient;
@@ -228,7 +228,7 @@ public String getBasePath() {
    * Sets the base URL to the location where the OpenAPI document is being served.
    *
    * @param basePath The base URL to the target host.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setBasePath(String basePath) {
     this.basePath = basePath;
@@ -248,7 +248,7 @@ public List<ServerConfiguration> getServers() {
    * <p>Setter for the field <code>servers</code>.</p>
    *
    * @param servers a {@link java.util.List} of servers.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setServers(List<ServerConfiguration> servers) {
     this.servers = servers;
@@ -269,7 +269,7 @@ public Integer getServerIndex() {
    * <p>Setter for the field <code>serverIndex</code>.</p>
    *
    * @param serverIndex the server index
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setServerIndex(Integer serverIndex) {
     this.serverIndex = serverIndex;
@@ -290,7 +290,7 @@ public Map<String, String> getServerVariables() {
    * <p>Setter for the field <code>serverVariables</code>.</p>
    *
    * @param serverVariables a {@link java.util.Map} of server variables.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setServerVariables(Map<String, String> serverVariables) {
     this.serverVariables = serverVariables;
@@ -327,7 +327,7 @@ public Authentication getAuthentication(String authName) {
    * Helper method to set username for the first HTTP basic authentication.
    *
    * @param username Username
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setUsername(String username) {
     for (Authentication auth : authentications.values()) {
@@ -343,7 +343,7 @@ public ApiClient setUsername(String username) {
    * Helper method to set password for the first HTTP basic authentication.
    *
    * @param password Password
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setPassword(String password) {
     for (Authentication auth : authentications.values()) {
@@ -359,7 +359,7 @@ public ApiClient setPassword(String password) {
    * Helper method to set API key value for the first API key authentication.
    *
    * @param apiKey API key
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setApiKey(String apiKey) {
     for (Authentication auth : authentications.values()) {
@@ -375,7 +375,7 @@ public ApiClient setApiKey(String apiKey) {
    * Helper method to configure authentications which respects aliases of API keys.
    *
    * @param secrets Hash map from authentication name to its secret.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient configureApiKeys(Map<String, String> secrets) {
     for (Map.Entry<String, Authentication> authEntry : authentications.entrySet()) {
@@ -397,7 +397,7 @@ public ApiClient configureApiKeys(Map<String, String> secrets) {
    * Helper method to set API key prefix for the first API key authentication.
    *
    * @param apiKeyPrefix API key prefix
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setApiKeyPrefix(String apiKeyPrefix) {
     for (Authentication auth : authentications.values()) {
@@ -413,7 +413,7 @@ public ApiClient setApiKeyPrefix(String apiKeyPrefix) {
    * Helper method to set bearer token for the first Bearer authentication.
    *
    * @param bearerToken Bearer token
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setBearerToken(String bearerToken) {
     for (Authentication auth : authentications.values()) {
@@ -429,7 +429,7 @@ public ApiClient setBearerToken(String bearerToken) {
    * Set the User-Agent header's value (by adding to the default header map).
    *
    * @param userAgent Http user agent
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setUserAgent(String userAgent) {
     this.userAgent = userAgent;
@@ -451,7 +451,7 @@ public String getUserAgent(){
    *
    * @param key The header's key
    * @param value The header's value
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient addDefaultHeader(String key, String value) {
     defaultHeaderMap.put(key, value);
@@ -463,7 +463,7 @@ public ApiClient addDefaultHeader(String key, String value) {
    *
    * @param key The cookie's key
    * @param value The cookie's value
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient addDefaultCookie(String key, String value) {
     defaultCookieMap.put(key, value);
@@ -483,7 +483,7 @@ public ClientConfig getClientConfig() {
    * Set the client config.
    *
    * @param clientConfig Set the client config
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setClientConfig(ClientConfig clientConfig) {
     this.clientConfig = clientConfig;
@@ -505,7 +505,7 @@ public boolean isDebugging() {
    * Enable/disable debugging for this API client.
    *
    * @param debugging To enable (true) or disable (false) debugging
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setDebugging(boolean debugging) {
     this.debugging = debugging;
@@ -529,7 +529,7 @@ public String getTempFolderPath() {
    * Set temp folder path
    *
    * @param tempFolderPath Temp folder path
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setTempFolderPath(String tempFolderPath) {
     this.tempFolderPath = tempFolderPath;
@@ -551,7 +551,7 @@ public int getConnectTimeout() {
    * {@link Integer#MAX_VALUE}.
    *
    * @param connectionTimeout Connection timeout in milliseconds
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setConnectTimeout(int connectionTimeout) {
     this.connectionTimeout = connectionTimeout;
@@ -574,7 +574,7 @@ public int getReadTimeout() {
    * {@link Integer#MAX_VALUE}.
    *
    * @param readTimeout Read timeout in milliseconds
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setReadTimeout(int readTimeout) {
     this.readTimeout = readTimeout;
@@ -595,7 +595,7 @@ public DateFormat getDateFormat() {
    * Set the date format used to parse/format date parameters.
    *
    * @param dateFormat Date format
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setDateFormat(DateFormat dateFormat) {
     this.dateFormat = dateFormat;
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/ApiClient.java b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/ApiClient.java
index d3def47a36cb..a912297d2158 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/ApiClient.java
@@ -159,7 +159,7 @@ public Client getHttpClient() {
    * <p>Setter for the field <code>httpClient</code>.</p>
    *
    * @param httpClient a {@link javax.ws.rs.client.Client} object.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setHttpClient(Client httpClient) {
     this.httpClient = httpClient;
@@ -179,7 +179,7 @@ public String getBasePath() {
    * Sets the base URL to the location where the OpenAPI document is being served.
    *
    * @param basePath The base URL to the target host.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setBasePath(String basePath) {
     this.basePath = basePath;
@@ -199,7 +199,7 @@ public List<ServerConfiguration> getServers() {
    * <p>Setter for the field <code>servers</code>.</p>
    *
    * @param servers a {@link java.util.List} of servers.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setServers(List<ServerConfiguration> servers) {
     this.servers = servers;
@@ -220,7 +220,7 @@ public Integer getServerIndex() {
    * <p>Setter for the field <code>serverIndex</code>.</p>
    *
    * @param serverIndex the server index
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setServerIndex(Integer serverIndex) {
     this.serverIndex = serverIndex;
@@ -241,7 +241,7 @@ public Map<String, String> getServerVariables() {
    * <p>Setter for the field <code>serverVariables</code>.</p>
    *
    * @param serverVariables a {@link java.util.Map} of server variables.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setServerVariables(Map<String, String> serverVariables) {
     this.serverVariables = serverVariables;
@@ -278,7 +278,7 @@ public Authentication getAuthentication(String authName) {
    * Helper method to set username for the first HTTP basic authentication.
    *
    * @param username Username
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setUsername(String username) {
     for (Authentication auth : authentications.values()) {
@@ -294,7 +294,7 @@ public ApiClient setUsername(String username) {
    * Helper method to set password for the first HTTP basic authentication.
    *
    * @param password Password
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setPassword(String password) {
     for (Authentication auth : authentications.values()) {
@@ -310,7 +310,7 @@ public ApiClient setPassword(String password) {
    * Helper method to set API key value for the first API key authentication.
    *
    * @param apiKey API key
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setApiKey(String apiKey) {
     for (Authentication auth : authentications.values()) {
@@ -326,7 +326,7 @@ public ApiClient setApiKey(String apiKey) {
    * Helper method to configure authentications which respects aliases of API keys.
    *
    * @param secrets Hash map from authentication name to its secret.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient configureApiKeys(Map<String, String> secrets) {
     for (Map.Entry<String, Authentication> authEntry : authentications.entrySet()) {
@@ -348,7 +348,7 @@ public ApiClient configureApiKeys(Map<String, String> secrets) {
    * Helper method to set API key prefix for the first API key authentication.
    *
    * @param apiKeyPrefix API key prefix
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setApiKeyPrefix(String apiKeyPrefix) {
     for (Authentication auth : authentications.values()) {
@@ -364,7 +364,7 @@ public ApiClient setApiKeyPrefix(String apiKeyPrefix) {
    * Helper method to set bearer token for the first Bearer authentication.
    *
    * @param bearerToken Bearer token
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setBearerToken(String bearerToken) {
     for (Authentication auth : authentications.values()) {
@@ -380,7 +380,7 @@ public ApiClient setBearerToken(String bearerToken) {
    * Set the User-Agent header's value (by adding to the default header map).
    *
    * @param userAgent Http user agent
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setUserAgent(String userAgent) {
     this.userAgent = userAgent;
@@ -402,7 +402,7 @@ public String getUserAgent(){
    *
    * @param key The header's key
    * @param value The header's value
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient addDefaultHeader(String key, String value) {
     defaultHeaderMap.put(key, value);
@@ -414,7 +414,7 @@ public ApiClient addDefaultHeader(String key, String value) {
    *
    * @param key The cookie's key
    * @param value The cookie's value
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient addDefaultCookie(String key, String value) {
     defaultCookieMap.put(key, value);
@@ -434,7 +434,7 @@ public ClientConfig getClientConfig() {
    * Set the client config.
    *
    * @param clientConfig Set the client config
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setClientConfig(ClientConfig clientConfig) {
     this.clientConfig = clientConfig;
@@ -456,7 +456,7 @@ public boolean isDebugging() {
    * Enable/disable debugging for this API client.
    *
    * @param debugging To enable (true) or disable (false) debugging
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setDebugging(boolean debugging) {
     this.debugging = debugging;
@@ -480,7 +480,7 @@ public String getTempFolderPath() {
    * Set temp folder path
    *
    * @param tempFolderPath Temp folder path
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setTempFolderPath(String tempFolderPath) {
     this.tempFolderPath = tempFolderPath;
@@ -502,7 +502,7 @@ public int getConnectTimeout() {
    * {@link Integer#MAX_VALUE}.
    *
    * @param connectionTimeout Connection timeout in milliseconds
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setConnectTimeout(int connectionTimeout) {
     this.connectionTimeout = connectionTimeout;
@@ -525,7 +525,7 @@ public int getReadTimeout() {
    * {@link Integer#MAX_VALUE}.
    *
    * @param readTimeout Read timeout in milliseconds
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setReadTimeout(int readTimeout) {
     this.readTimeout = readTimeout;
@@ -546,7 +546,7 @@ public DateFormat getDateFormat() {
    * Set the date format used to parse/format date parameters.
    *
    * @param dateFormat Date format
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setDateFormat(DateFormat dateFormat) {
     this.dateFormat = dateFormat;
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/ApiClient.java b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/ApiClient.java
index f0088bf572bf..62bd4c8ef14f 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/ApiClient.java
@@ -177,7 +177,7 @@ public Client getHttpClient() {
    * <p>Setter for the field <code>httpClient</code>.</p>
    *
    * @param httpClient a {@link javax.ws.rs.client.Client} object.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setHttpClient(Client httpClient) {
     this.httpClient = httpClient;
@@ -197,7 +197,7 @@ public String getBasePath() {
    * Sets the base URL to the location where the OpenAPI document is being served.
    *
    * @param basePath The base URL to the target host.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setBasePath(String basePath) {
     this.basePath = basePath;
@@ -218,7 +218,7 @@ public List<ServerConfiguration> getServers() {
    * <p>Setter for the field <code>servers</code>.</p>
    *
    * @param servers a {@link java.util.List} of servers.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setServers(List<ServerConfiguration> servers) {
     this.servers = servers;
@@ -239,7 +239,7 @@ public Integer getServerIndex() {
    * <p>Setter for the field <code>serverIndex</code>.</p>
    *
    * @param serverIndex the server index
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setServerIndex(Integer serverIndex) {
     this.serverIndex = serverIndex;
@@ -260,7 +260,7 @@ public Map<String, String> getServerVariables() {
    * <p>Setter for the field <code>serverVariables</code>.</p>
    *
    * @param serverVariables a {@link java.util.Map} of server variables.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setServerVariables(Map<String, String> serverVariables) {
     this.serverVariables = serverVariables;
@@ -305,7 +305,7 @@ public Authentication getAuthentication(String authName) {
    * Helper method to set username for the first HTTP basic authentication.
    *
    * @param username Username
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setUsername(String username) {
     for (Authentication auth : authentications.values()) {
@@ -321,7 +321,7 @@ public ApiClient setUsername(String username) {
    * Helper method to set password for the first HTTP basic authentication.
    *
    * @param password Password
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setPassword(String password) {
     for (Authentication auth : authentications.values()) {
@@ -337,7 +337,7 @@ public ApiClient setPassword(String password) {
    * Helper method to set API key value for the first API key authentication.
    *
    * @param apiKey API key
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setApiKey(String apiKey) {
     for (Authentication auth : authentications.values()) {
@@ -353,7 +353,7 @@ public ApiClient setApiKey(String apiKey) {
    * Helper method to configure authentications which respects aliases of API keys.
    *
    * @param secrets Hash map from authentication name to its secret.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient configureApiKeys(Map<String, String> secrets) {
     for (Map.Entry<String, Authentication> authEntry : authentications.entrySet()) {
@@ -375,7 +375,7 @@ public ApiClient configureApiKeys(Map<String, String> secrets) {
    * Helper method to set API key prefix for the first API key authentication.
    *
    * @param apiKeyPrefix API key prefix
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setApiKeyPrefix(String apiKeyPrefix) {
     for (Authentication auth : authentications.values()) {
@@ -391,7 +391,7 @@ public ApiClient setApiKeyPrefix(String apiKeyPrefix) {
    * Helper method to set bearer token for the first Bearer authentication.
    *
    * @param bearerToken Bearer token
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setBearerToken(String bearerToken) {
     for (Authentication auth : authentications.values()) {
@@ -407,7 +407,7 @@ public ApiClient setBearerToken(String bearerToken) {
    * Helper method to set access token for the first OAuth2 authentication.
    *
    * @param accessToken Access token
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setAccessToken(String accessToken) {
     for (Authentication auth : authentications.values()) {
@@ -424,7 +424,7 @@ public ApiClient setAccessToken(String accessToken) {
    *
    * @param clientId the client ID
    * @param clientSecret the client secret
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setOauthCredentials(String clientId, String clientSecret) {
     for (Authentication auth : authentications.values()) {
@@ -440,7 +440,7 @@ public ApiClient setOauthCredentials(String clientId, String clientSecret) {
    * Helper method to set the credentials of a public client for the first OAuth2 authentication.
    *
    * @param clientId the client ID
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setOauthCredentialsForPublicClient(String clientId) {
     for (Authentication auth : authentications.values()) {
@@ -457,7 +457,7 @@ public ApiClient setOauthCredentialsForPublicClient(String clientId) {
    *
    * @param username the user name
    * @param password the user password
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setOauthPasswordFlow(String username, String password) {
     for (Authentication auth : authentications.values()) {
@@ -473,7 +473,7 @@ public ApiClient setOauthPasswordFlow(String username, String password) {
    * Helper method to set the authorization code flow for the first OAuth2 authentication.
    *
    * @param code the authorization code
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setOauthAuthorizationCodeFlow(String code) {
     for (Authentication auth : authentications.values()) {
@@ -489,7 +489,7 @@ public ApiClient setOauthAuthorizationCodeFlow(String code) {
    * Helper method to set the scopes for the first OAuth2 authentication.
    *
    * @param scope the oauth scope
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setOauthScope(String scope) {
     for (Authentication auth : authentications.values()) {
@@ -505,7 +505,7 @@ public ApiClient setOauthScope(String scope) {
    * Set the User-Agent header's value (by adding to the default header map).
    *
    * @param userAgent Http user agent
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setUserAgent(String userAgent) {
     this.userAgent = userAgent;
@@ -527,7 +527,7 @@ public String getUserAgent(){
    *
    * @param key The header's key
    * @param value The header's value
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient addDefaultHeader(String key, String value) {
     defaultHeaderMap.put(key, value);
@@ -539,7 +539,7 @@ public ApiClient addDefaultHeader(String key, String value) {
    *
    * @param key The cookie's key
    * @param value The cookie's value
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient addDefaultCookie(String key, String value) {
     defaultCookieMap.put(key, value);
@@ -559,7 +559,7 @@ public ClientConfig getClientConfig() {
    * Set the client config.
    *
    * @param clientConfig Set the client config
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setClientConfig(ClientConfig clientConfig) {
     this.clientConfig = clientConfig;
@@ -581,7 +581,7 @@ public boolean isDebugging() {
    * Enable/disable debugging for this API client.
    *
    * @param debugging To enable (true) or disable (false) debugging
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setDebugging(boolean debugging) {
     this.debugging = debugging;
@@ -605,7 +605,7 @@ public String getTempFolderPath() {
    * Set temp folder path
    *
    * @param tempFolderPath Temp folder path
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setTempFolderPath(String tempFolderPath) {
     this.tempFolderPath = tempFolderPath;
@@ -627,7 +627,7 @@ public int getConnectTimeout() {
    * {@link Integer#MAX_VALUE}.
    *
    * @param connectionTimeout Connection timeout in milliseconds
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setConnectTimeout(int connectionTimeout) {
     this.connectionTimeout = connectionTimeout;
@@ -650,7 +650,7 @@ public int getReadTimeout() {
    * {@link Integer#MAX_VALUE}.
    *
    * @param readTimeout Read timeout in milliseconds
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setReadTimeout(int readTimeout) {
     this.readTimeout = readTimeout;
@@ -671,7 +671,7 @@ public DateFormat getDateFormat() {
    * Set the date format used to parse/format date parameters.
    *
    * @param dateFormat Date format
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setDateFormat(DateFormat dateFormat) {
     this.dateFormat = dateFormat;
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/ApiClient.java b/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/ApiClient.java
index f0088bf572bf..62bd4c8ef14f 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/ApiClient.java
@@ -177,7 +177,7 @@ public Client getHttpClient() {
    * <p>Setter for the field <code>httpClient</code>.</p>
    *
    * @param httpClient a {@link javax.ws.rs.client.Client} object.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setHttpClient(Client httpClient) {
     this.httpClient = httpClient;
@@ -197,7 +197,7 @@ public String getBasePath() {
    * Sets the base URL to the location where the OpenAPI document is being served.
    *
    * @param basePath The base URL to the target host.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setBasePath(String basePath) {
     this.basePath = basePath;
@@ -218,7 +218,7 @@ public List<ServerConfiguration> getServers() {
    * <p>Setter for the field <code>servers</code>.</p>
    *
    * @param servers a {@link java.util.List} of servers.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setServers(List<ServerConfiguration> servers) {
     this.servers = servers;
@@ -239,7 +239,7 @@ public Integer getServerIndex() {
    * <p>Setter for the field <code>serverIndex</code>.</p>
    *
    * @param serverIndex the server index
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setServerIndex(Integer serverIndex) {
     this.serverIndex = serverIndex;
@@ -260,7 +260,7 @@ public Map<String, String> getServerVariables() {
    * <p>Setter for the field <code>serverVariables</code>.</p>
    *
    * @param serverVariables a {@link java.util.Map} of server variables.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setServerVariables(Map<String, String> serverVariables) {
     this.serverVariables = serverVariables;
@@ -305,7 +305,7 @@ public Authentication getAuthentication(String authName) {
    * Helper method to set username for the first HTTP basic authentication.
    *
    * @param username Username
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setUsername(String username) {
     for (Authentication auth : authentications.values()) {
@@ -321,7 +321,7 @@ public ApiClient setUsername(String username) {
    * Helper method to set password for the first HTTP basic authentication.
    *
    * @param password Password
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setPassword(String password) {
     for (Authentication auth : authentications.values()) {
@@ -337,7 +337,7 @@ public ApiClient setPassword(String password) {
    * Helper method to set API key value for the first API key authentication.
    *
    * @param apiKey API key
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setApiKey(String apiKey) {
     for (Authentication auth : authentications.values()) {
@@ -353,7 +353,7 @@ public ApiClient setApiKey(String apiKey) {
    * Helper method to configure authentications which respects aliases of API keys.
    *
    * @param secrets Hash map from authentication name to its secret.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient configureApiKeys(Map<String, String> secrets) {
     for (Map.Entry<String, Authentication> authEntry : authentications.entrySet()) {
@@ -375,7 +375,7 @@ public ApiClient configureApiKeys(Map<String, String> secrets) {
    * Helper method to set API key prefix for the first API key authentication.
    *
    * @param apiKeyPrefix API key prefix
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setApiKeyPrefix(String apiKeyPrefix) {
     for (Authentication auth : authentications.values()) {
@@ -391,7 +391,7 @@ public ApiClient setApiKeyPrefix(String apiKeyPrefix) {
    * Helper method to set bearer token for the first Bearer authentication.
    *
    * @param bearerToken Bearer token
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setBearerToken(String bearerToken) {
     for (Authentication auth : authentications.values()) {
@@ -407,7 +407,7 @@ public ApiClient setBearerToken(String bearerToken) {
    * Helper method to set access token for the first OAuth2 authentication.
    *
    * @param accessToken Access token
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setAccessToken(String accessToken) {
     for (Authentication auth : authentications.values()) {
@@ -424,7 +424,7 @@ public ApiClient setAccessToken(String accessToken) {
    *
    * @param clientId the client ID
    * @param clientSecret the client secret
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setOauthCredentials(String clientId, String clientSecret) {
     for (Authentication auth : authentications.values()) {
@@ -440,7 +440,7 @@ public ApiClient setOauthCredentials(String clientId, String clientSecret) {
    * Helper method to set the credentials of a public client for the first OAuth2 authentication.
    *
    * @param clientId the client ID
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setOauthCredentialsForPublicClient(String clientId) {
     for (Authentication auth : authentications.values()) {
@@ -457,7 +457,7 @@ public ApiClient setOauthCredentialsForPublicClient(String clientId) {
    *
    * @param username the user name
    * @param password the user password
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setOauthPasswordFlow(String username, String password) {
     for (Authentication auth : authentications.values()) {
@@ -473,7 +473,7 @@ public ApiClient setOauthPasswordFlow(String username, String password) {
    * Helper method to set the authorization code flow for the first OAuth2 authentication.
    *
    * @param code the authorization code
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setOauthAuthorizationCodeFlow(String code) {
     for (Authentication auth : authentications.values()) {
@@ -489,7 +489,7 @@ public ApiClient setOauthAuthorizationCodeFlow(String code) {
    * Helper method to set the scopes for the first OAuth2 authentication.
    *
    * @param scope the oauth scope
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setOauthScope(String scope) {
     for (Authentication auth : authentications.values()) {
@@ -505,7 +505,7 @@ public ApiClient setOauthScope(String scope) {
    * Set the User-Agent header's value (by adding to the default header map).
    *
    * @param userAgent Http user agent
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setUserAgent(String userAgent) {
     this.userAgent = userAgent;
@@ -527,7 +527,7 @@ public String getUserAgent(){
    *
    * @param key The header's key
    * @param value The header's value
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient addDefaultHeader(String key, String value) {
     defaultHeaderMap.put(key, value);
@@ -539,7 +539,7 @@ public ApiClient addDefaultHeader(String key, String value) {
    *
    * @param key The cookie's key
    * @param value The cookie's value
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient addDefaultCookie(String key, String value) {
     defaultCookieMap.put(key, value);
@@ -559,7 +559,7 @@ public ClientConfig getClientConfig() {
    * Set the client config.
    *
    * @param clientConfig Set the client config
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setClientConfig(ClientConfig clientConfig) {
     this.clientConfig = clientConfig;
@@ -581,7 +581,7 @@ public boolean isDebugging() {
    * Enable/disable debugging for this API client.
    *
    * @param debugging To enable (true) or disable (false) debugging
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setDebugging(boolean debugging) {
     this.debugging = debugging;
@@ -605,7 +605,7 @@ public String getTempFolderPath() {
    * Set temp folder path
    *
    * @param tempFolderPath Temp folder path
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setTempFolderPath(String tempFolderPath) {
     this.tempFolderPath = tempFolderPath;
@@ -627,7 +627,7 @@ public int getConnectTimeout() {
    * {@link Integer#MAX_VALUE}.
    *
    * @param connectionTimeout Connection timeout in milliseconds
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setConnectTimeout(int connectionTimeout) {
     this.connectionTimeout = connectionTimeout;
@@ -650,7 +650,7 @@ public int getReadTimeout() {
    * {@link Integer#MAX_VALUE}.
    *
    * @param readTimeout Read timeout in milliseconds
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setReadTimeout(int readTimeout) {
     this.readTimeout = readTimeout;
@@ -671,7 +671,7 @@ public DateFormat getDateFormat() {
    * Set the date format used to parse/format date parameters.
    *
    * @param dateFormat Date format
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setDateFormat(DateFormat dateFormat) {
     this.dateFormat = dateFormat;
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
index 4ee92950064f..0d607da88761 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
@@ -275,7 +275,7 @@ public Client getHttpClient() {
    * <p>Setter for the field <code>httpClient</code>.</p>
    *
    * @param httpClient a {@link javax.ws.rs.client.Client} object.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setHttpClient(Client httpClient) {
     this.httpClient = httpClient;
@@ -295,7 +295,7 @@ public String getBasePath() {
    * Sets the base URL to the location where the OpenAPI document is being served.
    *
    * @param basePath The base URL to the target host.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setBasePath(String basePath) {
     this.basePath = basePath;
@@ -316,7 +316,7 @@ public List<ServerConfiguration> getServers() {
    * <p>Setter for the field <code>servers</code>.</p>
    *
    * @param servers a {@link java.util.List} of servers.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setServers(List<ServerConfiguration> servers) {
     this.servers = servers;
@@ -337,7 +337,7 @@ public Integer getServerIndex() {
    * <p>Setter for the field <code>serverIndex</code>.</p>
    *
    * @param serverIndex the server index
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setServerIndex(Integer serverIndex) {
     this.serverIndex = serverIndex;
@@ -358,7 +358,7 @@ public Map<String, String> getServerVariables() {
    * <p>Setter for the field <code>serverVariables</code>.</p>
    *
    * @param serverVariables a {@link java.util.Map} of server variables.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setServerVariables(Map<String, String> serverVariables) {
     this.serverVariables = serverVariables;
@@ -403,7 +403,7 @@ public Authentication getAuthentication(String authName) {
    * Helper method to set username for the first HTTP basic authentication.
    *
    * @param username Username
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setUsername(String username) {
     for (Authentication auth : authentications.values()) {
@@ -419,7 +419,7 @@ public ApiClient setUsername(String username) {
    * Helper method to set password for the first HTTP basic authentication.
    *
    * @param password Password
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setPassword(String password) {
     for (Authentication auth : authentications.values()) {
@@ -435,7 +435,7 @@ public ApiClient setPassword(String password) {
    * Helper method to set API key value for the first API key authentication.
    *
    * @param apiKey API key
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setApiKey(String apiKey) {
     for (Authentication auth : authentications.values()) {
@@ -451,7 +451,7 @@ public ApiClient setApiKey(String apiKey) {
    * Helper method to configure authentications which respects aliases of API keys.
    *
    * @param secrets Hash map from authentication name to its secret.
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient configureApiKeys(Map<String, String> secrets) {
     for (Map.Entry<String, Authentication> authEntry : authentications.entrySet()) {
@@ -473,7 +473,7 @@ public ApiClient configureApiKeys(Map<String, String> secrets) {
    * Helper method to set API key prefix for the first API key authentication.
    *
    * @param apiKeyPrefix API key prefix
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setApiKeyPrefix(String apiKeyPrefix) {
     for (Authentication auth : authentications.values()) {
@@ -489,7 +489,7 @@ public ApiClient setApiKeyPrefix(String apiKeyPrefix) {
    * Helper method to set bearer token for the first Bearer authentication.
    *
    * @param bearerToken Bearer token
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setBearerToken(String bearerToken) {
     for (Authentication auth : authentications.values()) {
@@ -505,7 +505,7 @@ public ApiClient setBearerToken(String bearerToken) {
    * Helper method to set access token for the first OAuth2 authentication.
    *
    * @param accessToken Access token
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setAccessToken(String accessToken) {
     for (Authentication auth : authentications.values()) {
@@ -522,7 +522,7 @@ public ApiClient setAccessToken(String accessToken) {
    *
    * @param clientId the client ID
    * @param clientSecret the client secret
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setOauthCredentials(String clientId, String clientSecret) {
     for (Authentication auth : authentications.values()) {
@@ -538,7 +538,7 @@ public ApiClient setOauthCredentials(String clientId, String clientSecret) {
    * Helper method to set the credentials of a public client for the first OAuth2 authentication.
    *
    * @param clientId the client ID
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setOauthCredentialsForPublicClient(String clientId) {
     for (Authentication auth : authentications.values()) {
@@ -555,7 +555,7 @@ public ApiClient setOauthCredentialsForPublicClient(String clientId) {
    *
    * @param username the user name
    * @param password the user password
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setOauthPasswordFlow(String username, String password) {
     for (Authentication auth : authentications.values()) {
@@ -571,7 +571,7 @@ public ApiClient setOauthPasswordFlow(String username, String password) {
    * Helper method to set the authorization code flow for the first OAuth2 authentication.
    *
    * @param code the authorization code
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setOauthAuthorizationCodeFlow(String code) {
     for (Authentication auth : authentications.values()) {
@@ -587,7 +587,7 @@ public ApiClient setOauthAuthorizationCodeFlow(String code) {
    * Helper method to set the scopes for the first OAuth2 authentication.
    *
    * @param scope the oauth scope
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setOauthScope(String scope) {
     for (Authentication auth : authentications.values()) {
@@ -603,7 +603,7 @@ public ApiClient setOauthScope(String scope) {
    * Set the User-Agent header's value (by adding to the default header map).
    *
    * @param userAgent Http user agent
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setUserAgent(String userAgent) {
     this.userAgent = userAgent;
@@ -625,7 +625,7 @@ public String getUserAgent(){
    *
    * @param key The header's key
    * @param value The header's value
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient addDefaultHeader(String key, String value) {
     defaultHeaderMap.put(key, value);
@@ -637,7 +637,7 @@ public ApiClient addDefaultHeader(String key, String value) {
    *
    * @param key The cookie's key
    * @param value The cookie's value
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient addDefaultCookie(String key, String value) {
     defaultCookieMap.put(key, value);
@@ -657,7 +657,7 @@ public ClientConfig getClientConfig() {
    * Set the client config.
    *
    * @param clientConfig Set the client config
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setClientConfig(ClientConfig clientConfig) {
     this.clientConfig = clientConfig;
@@ -679,7 +679,7 @@ public boolean isDebugging() {
    * Enable/disable debugging for this API client.
    *
    * @param debugging To enable (true) or disable (false) debugging
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setDebugging(boolean debugging) {
     this.debugging = debugging;
@@ -703,7 +703,7 @@ public String getTempFolderPath() {
    * Set temp folder path
    *
    * @param tempFolderPath Temp folder path
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setTempFolderPath(String tempFolderPath) {
     this.tempFolderPath = tempFolderPath;
@@ -725,7 +725,7 @@ public int getConnectTimeout() {
    * {@link Integer#MAX_VALUE}.
    *
    * @param connectionTimeout Connection timeout in milliseconds
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setConnectTimeout(int connectionTimeout) {
     this.connectionTimeout = connectionTimeout;
@@ -748,7 +748,7 @@ public int getReadTimeout() {
    * {@link Integer#MAX_VALUE}.
    *
    * @param readTimeout Read timeout in milliseconds
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setReadTimeout(int readTimeout) {
     this.readTimeout = readTimeout;
@@ -769,7 +769,7 @@ public DateFormat getDateFormat() {
    * Set the date format used to parse/format date parameters.
    *
    * @param dateFormat Date format
-   * @return a {@link org.openapitools.client.ApiClient} object.
+   * @return a {@link ApiClient} object.
    */
   public ApiClient setDateFormat(DateFormat dateFormat) {
     this.dateFormat = dateFormat;