fix(java) address review comments

- add missing 7.14->7.15 changes
- rm misplaced `{`
- use custom ApiException

Author: cgoetz-inovex

languages/java/templates/ApiClient.mustache

@@ -268,7 +268,7 @@ public class ApiClient {
             }
         }
         RetryingOAuth retryingOAuth = new RetryingOAuth(tokenUrl, clientId, OAuthFlow.{{#lambda.uppercase}}{{#lambda.snakecase}}{{flow}}{{/lambda.snakecase}}{{/lambda.uppercase}}, clientSecret, parameters);
-        {authentications.put(
+        authentications.put(
                 "{{name}}",
                 retryingOAuth
         );
@@ -1091,7 +1091,7 @@ public class ApiClient {
      * @param response HTTP response
      * @param returnType The type of the Java object
      * @return The deserialized Java object
-     * @throws {{invokerPackage}}.ApiException If fail to deserialize response body, i.e. cannot read response body
+     * @throws cloud.stackit.sdk.core.exception.ApiException If fail to deserialize response body, i.e. cannot read response body
      *   or the Content-Type of the response is not supported.
      */
     @SuppressWarnings("unchecked")
@@ -1161,7 +1161,7 @@ public class ApiClient {
      * @param obj The Java object
      * @param contentType The request Content-Type
      * @return The serialized request body
-     * @throws {{invokerPackage}}.ApiException If fail to serialize the given object
+     * @throws cloud.stackit.sdk.core.exception.ApiException If fail to serialize the given object
      */
     public RequestBody serialize(Object obj, String contentType) throws ApiException {
         if (obj instanceof byte[]) {
@@ -1191,7 +1191,7 @@ public class ApiClient {
      * Download file from the given response.
      *
      * @param response An instance of the Response object
-     * @throws {{invokerPackage}}.ApiException If fail to read file content from response and write to disk
+     * @throws cloud.stackit.sdk.core.exception.ApiException If fail to read file content from response and write to disk
      * @return Downloaded file
      */
     public File downloadFileFromResponse(Response response) throws ApiException {
@@ -1255,7 +1255,7 @@ public class ApiClient {
      * @param <T> Type
      * @param call An instance of the Call object
      * @return ApiResponse&lt;T&gt;
-     * @throws {{invokerPackage}}.ApiException If fail to execute the call
+     * @throws cloud.stackit.sdk.core.exception.ApiException If fail to execute the call
      */
     public <T> ApiResponse<T> execute(Call call) throws ApiException {
         return execute(call, null);
@@ -1270,7 +1270,7 @@ public class ApiClient {
      * @return ApiResponse object containing response status, headers and
      *   data, which is a Java object deserialized from response body and would be null
      *   when returnType is null.
-     * @throws {{invokerPackage}}.ApiException If fail to execute the call
+     * @throws cloud.stackit.sdk.core.exception.ApiException If fail to execute the call
      */
     public <T> ApiResponse<T> execute(Call call, Type returnType) throws ApiException {
         try {
@@ -1289,7 +1289,7 @@ public class ApiClient {
      * @param call a {@link okhttp3.Call} object
      * @param returnType a {@link java.lang.reflect.Type} object
      * @return a {@link java.io.InputStream} object
-     * @throws {{invokerPackage}}.ApiException if any.
+     * @throws cloud.stackit.sdk.core.exception.ApiException if any.
      */
     public InputStream executeStream(Call call, Type returnType) throws ApiException {
         try {
@@ -1359,7 +1359,7 @@ public class ApiClient {
      * @param response Response
      * @param returnType Return type
      * @return Type
-     * @throws {{invokerPackage}}.ApiException If the response has an unsuccessful status code or
+     * @throws cloud.stackit.sdk.core.exception.ApiException If the response has an unsuccessful status code or
      *                      fail to deserialize the response body
      */
     public <T> T handleResponse(Response response, Type returnType) throws ApiException {
@@ -1406,7 +1406,7 @@ public class ApiClient {
      * @param authNames The authentications to apply
      * @param callback Callback for upload/download progress
      * @return The HTTP call
-     * @throws {{invokerPackage}}.ApiException If fail to serialize the request body object
+     * @throws cloud.stackit.sdk.core.exception.ApiException If fail to serialize the request body object
      */
     public Call buildCall(String baseUrl, String path, String method, List<Pair> queryParams, List<Pair> collectionQueryParams, Object body, Map<String, String> headerParams, Map<String, String> cookieParams, Map<String, Object> formParams, String[] authNames, ApiCallback callback) throws ApiException {
         Request request = buildRequest(baseUrl, path, method, queryParams, collectionQueryParams, body, headerParams, cookieParams, formParams, authNames, callback);
@@ -1429,7 +1429,7 @@ public class ApiClient {
      * @param authNames The authentications to apply
      * @param callback Callback for upload/download progress
      * @return The HTTP request
-     * @throws {{invokerPackage}}.ApiException If fail to serialize the request body object
+     * @throws cloud.stackit.sdk.core.exception.ApiException If fail to serialize the request body object
      */
     public Request buildRequest(String baseUrl, String path, String method, List<Pair> queryParams, List<Pair> collectionQueryParams, Object body, Map<String, String> headerParams, Map<String, String> cookieParams, Map<String, Object> formParams, String[] authNames, ApiCallback callback) throws ApiException {
         final String url = buildUrl(baseUrl, path, queryParams, collectionQueryParams);
@@ -1866,7 +1866,7 @@ public class ApiClient {
      *
      * @param requestBody The HTTP request object
      * @return The string representation of the HTTP request body
-     * @throws {{invokerPackage}}.ApiException If fail to serialize the request body object into a string
+     * @throws cloud.stackit.sdk.core.exception.ApiException If fail to serialize the request body object into a string
      */
     protected String requestBodyToString(RequestBody requestBody) throws ApiException {
         if (requestBody != null) {

languages/java/templates/api.mustache

@@ -1,5 +1,5 @@
 {{! This template was customized to initialize the DefaultApi with the CoreConfiguration to easily setup the KeyFlow Authentication and custom endpoints. }}
-{{! Original template: https://github.com/OpenAPITools/openapi-generator/blob/v7.14.0/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/api.mustache }}
+{{! Original template: https://github.com/OpenAPITools/openapi-generator/blob/v7.19.0/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/api.mustache }}
 
 {{>licenseInfo}}
 
@@ -478,11 +478,11 @@ class {{classname}} {
 
     public class API{{operationId}}Request {
         {{#requiredParams}}
-        {{>nullable_var_annotations}}
+        {{>nullable_var_annotations}}{{! prevent indent}}
         private final {{{dataType}}} {{paramName}};
         {{/requiredParams}}
         {{#optionalParams}}
-        {{>nullable_var_annotations}}
+        {{>nullable_var_annotations}}{{! prevent indent}}
         private {{{dataType}}} {{paramName}};
         {{/optionalParams}}
 

languages/java/templates/build.gradle.mustache

@@ -1,5 +1,5 @@
 {{! This template was customized to allow the services to be a subprojects in one big gradle project. }}
-{{! Original template: https://github.com/OpenAPITools/openapi-generator/blob/v7.14.0/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache }}
+{{! Original template: https://github.com/OpenAPITools/openapi-generator/blob/v7.19.0/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache }}
 
 ext {
     {{#swagger1AnnotationLibrary}}
@@ -36,7 +36,7 @@ dependencies {
     {{#hasOAuthMethods}}
     implementation group: 'org.apache.oltu.oauth2', name: 'org.apache.oltu.oauth2.client', version: '1.0.2'
     {{/hasOAuthMethods}}
-    implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.17.0'
+    implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.18.0'
     {{#joda}}
     implementation 'joda-time:joda-time:2.9.9'
     {{/joda}}