Bump jmustache 1.15 -> 1.16

modules/openapi-generator/src/main/resources/Java/ApiClient.mustache

@@ -64,6 +64,7 @@ import {{invokerPackage}}.auth.OAuth;
 {{/hasOAuthMethods}}
 
 {{>generatedAnnotation}}
+
 public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
   protected Map<String, String> defaultHeaderMap = new HashMap<String, String>();
   protected Map<String, String> defaultCookieMap = new HashMap<String, String>();

modules/openapi-generator/src/main/resources/Java/Configuration.mustache

@@ -7,6 +7,7 @@ import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Supplier;
 
 {{>generatedAnnotation}}
+
 public class Configuration {
   public static final String VERSION = "{{{artifactVersion}}}";
 

modules/openapi-generator/src/main/resources/Java/JavaTimeFormatter.mustache

@@ -10,6 +10,7 @@ import java.time.format.DateTimeParseException;
  * It's generated for java clients when {@code AbstractJavaCodegen#dateLibrary} specified as {@code java8}.
  */
 {{>generatedAnnotation}}
+
 public class JavaTimeFormatter {
   private DateTimeFormatter offsetDateTimeFormatter = DateTimeFormatter.ISO_OFFSET_DATE_TIME;
 

modules/openapi-generator/src/main/resources/Java/Pair.mustache

@@ -3,6 +3,7 @@
 package {{invokerPackage}};
 
 {{>generatedAnnotation}}
+
 public class Pair {
   private final String name;
   private final String value;

modules/openapi-generator/src/main/resources/Java/RFC3339DateFormat.mustache

@@ -12,6 +12,7 @@ import java.util.GregorianCalendar;
 import java.util.TimeZone;
 
 {{>generatedAnnotation}}
+
 public class RFC3339DateFormat extends DateFormat {
   private static final long serialVersionUID = 1L;
   private static final TimeZone TIMEZONE_Z = TimeZone.getTimeZone("UTC");

modules/openapi-generator/src/main/resources/Java/RFC3339InstantDeserializer.mustache

@@ -18,6 +18,7 @@ import com.fasterxml.jackson.datatype.jsr310.JavaTimeFeature;
 import com.fasterxml.jackson.datatype.jsr310.deser.InstantDeserializer;
 
 {{>generatedAnnotation}}
+
 public class RFC3339InstantDeserializer<T extends Temporal> extends InstantDeserializer<T> {
     private static final long serialVersionUID = 1L;
     private final static boolean DEFAULT_NORMALIZE_ZONE_ID = JavaTimeFeature.NORMALIZE_DESERIALIZED_ZONE_ID.enabledByDefault();

modules/openapi-generator/src/main/resources/Java/RFC3339JavaTimeModule.mustache

@@ -8,6 +8,7 @@ import java.time.ZonedDateTime;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 
 {{>generatedAnnotation}}
+
 public class RFC3339JavaTimeModule extends SimpleModule {
     private static final long serialVersionUID = 1L;
 

modules/openapi-generator/src/main/resources/Java/ServerConfiguration.mustache

@@ -8,6 +8,7 @@ import java.util.Map;
  * Representing a Server configuration.
  */
 {{>generatedAnnotation}}
+
 public class ServerConfiguration {
     public String URL;
     public String description;

modules/openapi-generator/src/main/resources/Java/ServerVariable.mustache

@@ -8,6 +8,7 @@ import java.util.HashSet;
  * Representing a Server Variable for server URL template substitution.
  */
 {{>generatedAnnotation}}
+
 public class ServerVariable {
     public String description;
     public String defaultValue;

modules/openapi-generator/src/main/resources/Java/StringUtil.mustache

@@ -6,6 +6,7 @@ import java.util.Collection;
 import java.util.Iterator;
 
 {{>generatedAnnotation}}
+
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).

modules/openapi-generator/src/main/resources/Java/api.mustache

@@ -19,6 +19,7 @@ import java.util.List;
 import java.util.Map;
 
 {{>generatedAnnotation}}
+
 {{#operations}}
 public class {{classname}} {
   private ApiClient apiClient;

modules/openapi-generator/src/main/resources/Java/apiException.mustache

@@ -6,6 +6,7 @@ import java.util.Map;
 import java.util.List;
 
 {{>generatedAnnotation}}
+
 public class ApiException extends{{#useRuntimeException}} RuntimeException {{/useRuntimeException}}{{^useRuntimeException}} Exception {{/useRuntimeException}}{
     private static final long serialVersionUID = 1L;
 

modules/openapi-generator/src/main/resources/Java/auth/ApiKeyAuth.mustache

@@ -8,6 +8,7 @@ import java.util.Map;
 import java.util.List;
 
 {{>generatedAnnotation}}
+
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;

modules/openapi-generator/src/main/resources/Java/auth/Authentication.mustache

@@ -8,6 +8,7 @@ import java.util.Map;
 import java.util.List;
 
 {{>generatedAnnotation}}
+
 public interface Authentication {
   /**
    * Apply authentication settings to header and query params.

modules/openapi-generator/src/main/resources/Java/auth/HttpBasicAuth.mustache

@@ -11,6 +11,7 @@ import java.util.Map;
 import java.util.List;
 
 {{>generatedAnnotation}}
+
 public class HttpBasicAuth implements Authentication {
   private String username;
   private String password;

modules/openapi-generator/src/main/resources/Java/auth/HttpBearerAuth.mustache

@@ -9,6 +9,7 @@ import java.util.Map;
 import java.util.function.Supplier;
 
 {{>generatedAnnotation}}
+
 public class HttpBearerAuth implements Authentication {
   private final String scheme;
   private Supplier<String> tokenSupplier;

modules/openapi-generator/src/main/resources/Java/auth/OAuth.mustache

@@ -8,6 +8,7 @@ import java.util.Map;
 import java.util.List;
 
 {{>generatedAnnotation}}
+
 public class OAuth implements Authentication {
   private String accessToken;
 

modules/openapi-generator/src/main/resources/Java/auth/OAuthFlow.mustache

@@ -6,6 +6,7 @@ package {{invokerPackage}}.auth;
  * OAuth flows that are supported by this client
  */
 {{>generatedAnnotation}}
+
 public enum OAuthFlow {
     ACCESS_CODE, //called authorizationCode  in OpenAPI 3.0
     IMPLICIT,

modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/ApiClient.mustache

@@ -86,6 +86,7 @@ import {{invokerPackage}}.auth.OAuth;
 {{/hasOAuthMethods}}
 
 {{>generatedAnnotation}}
+
 public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
   protected Map<String, String> defaultHeaderMap = new HashMap<String, String>();
   protected Map<String, String> defaultCookieMap = new HashMap<String, String>();

modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/BaseApi.mustache

@@ -7,6 +7,7 @@ import java.util.Collections;
 import java.util.Map;
 
 {{>generatedAnnotation}}
+
 public abstract class BaseApi {
 
   protected ApiClient apiClient;

modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/api.mustache

@@ -29,6 +29,7 @@ import {{javaxPackage}}.validation.Valid;
 
 {{/useBeanValidation}}
 {{>generatedAnnotation}}
+
 {{#operations}}
 public class {{classname}} extends BaseApi {
 

modules/openapi-generator/src/main/resources/Java/libraries/feign/ApiClient.mustache

@@ -53,6 +53,7 @@ import feign.Retryer;
 {{/hasOAuthMethods}}
 
 {{>generatedAnnotation}}
+
 public class ApiClient {
   protected static final Logger log = Logger.getLogger(ApiClient.class.getName());
 

modules/openapi-generator/src/main/resources/Java/libraries/feign/api.mustache

@@ -22,6 +22,7 @@ import {{javaxPackage}}.validation.Valid;
 import feign.*;
 
 {{>generatedAnnotation}}
+
 public interface {{classname}} extends ApiClient.Api {
 
 {{#operations}}{{#operation}}

modules/openapi-generator/src/main/resources/Java/libraries/feign/auth/DefaultApi20Impl.mustache

@@ -12,6 +12,7 @@ import com.github.scribejava.core.oauth2.clientauthentication.ClientAuthenticati
 import com.github.scribejava.core.oauth2.clientauthentication.RequestBodyAuthenticationScheme;
 
 {{>generatedAnnotation}}
+
 public class DefaultApi20Impl extends DefaultApi20 {
 
     private final String accessTokenEndpoint;

modules/openapi-generator/src/main/resources/Java/libraries/feign/auth/OAuth.mustache

@@ -10,6 +10,7 @@ import feign.RequestTemplate;
 import java.util.Collection;
 
 {{>generatedAnnotation}}
+
 public abstract class OAuth implements RequestInterceptor {
 
   //https://datatracker.ietf.org/doc/html/rfc7519#section-4.1.4

modules/openapi-generator/src/main/resources/Java/libraries/feign/auth/OauthClientCredentialsGrant.mustache

@@ -6,6 +6,7 @@ import com.github.scribejava.core.builder.ServiceBuilder;
 import com.github.scribejava.core.model.OAuth2AccessToken;
 
 {{>generatedAnnotation}}
+
 public class OauthClientCredentialsGrant extends OAuth {
 
   public OauthClientCredentialsGrant(String authorizationUrl, String tokenUrl, String scopes) {

modules/openapi-generator/src/main/resources/Java/libraries/feign/auth/OauthPasswordGrant.mustache

@@ -6,6 +6,7 @@ import com.github.scribejava.core.builder.ServiceBuilder;
 import com.github.scribejava.core.model.OAuth2AccessToken;
 
 {{>generatedAnnotation}}
+
 public class OauthPasswordGrant extends OAuth {
 
   private String username;

modules/openapi-generator/src/main/resources/Java/libraries/feign/pojo.mustache

@@ -33,10 +33,12 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
     {{#isEnum}}
     {{^isContainer}}
 {{>modelInnerEnum}}
+
     {{/isContainer}}
     {{#isContainer}}
     {{#mostInnerItems}}
 {{>modelInnerEnum}}
+
     {{/mostInnerItems}}
     {{/isContainer}}
     {{/isEnum}}
@@ -72,7 +74,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
   {{/isContainer}}
   {{/vendorExtensions.x-is-jackson-optional-nullable}}
   {{^vendorExtensions.x-is-jackson-optional-nullable}}
-  {{>nullable_var_annotations}}
+  {{>nullable_var_annotations}}{{! prevent indent}}
   {{#isContainer}}
   private {{{datatypeWithEnum}}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}};
   {{/isContainer}}
@@ -190,12 +192,13 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
 {{#deprecated}}
   @Deprecated
 {{/deprecated}}
-  {{>nullable_var_annotations}}
+  {{>nullable_var_annotations}}{{! prevent indent}}
 {{#jsonb}}
   @JsonbProperty("{{baseName}}")
 {{/jsonb}}
 {{#useBeanValidation}}
 {{>beanValidation}}
+
 {{/useBeanValidation}}
 {{#swagger1AnnotationLibrary}}
   @ApiModelProperty({{#example}}example = "{{{.}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
@@ -224,6 +227,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
 
   {{#vendorExtensions.x-is-jackson-optional-nullable}}
 {{> jackson_annotations}}
+
   public JsonNullable<{{{datatypeWithEnum}}}> {{getter}}_JsonNullable() {
     return {{name}};
   }
@@ -249,6 +253,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
 
   {{/vars}}
 {{>libraries/feign/additional_properties}}
+
   @Override
   public boolean equals(Object o) {
   {{#useReflectionEqualsHashCode}}

modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/ApiClient.mustache

@@ -24,6 +24,7 @@ import java.io.IOException;
 import java.io.OutputStream;
 
 {{>generatedAnnotation}}
+
 public class ApiClient {
     protected final String basePath;
     protected final HttpRequestFactory httpRequestFactory;

modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/api.mustache

@@ -23,6 +23,7 @@ import java.util.List;
 import java.util.ArrayList;
 
 {{>generatedAnnotation}}
+
 {{#operations}}
 public class {{classname}} {
     private ApiClient apiClient;

modules/openapi-generator/src/main/resources/Java/libraries/jersey2/AbstractOpenApiSchema.mustache

@@ -14,6 +14,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
  * Abstract class for oneOf,anyOf schemas defined in OpenAPI spec
  */
 {{>generatedAnnotation}}
+
 public abstract class AbstractOpenApiSchema {
 
     // store the actual instance of the schema/object
@@ -135,4 +136,5 @@ public abstract class AbstractOpenApiSchema {
 
 {{>libraries/jersey2/additional_properties}}
 
+
 }

modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache

@@ -84,6 +84,7 @@ import {{invokerPackage}}.auth.OAuth;
  * <p>ApiClient class.</p>
  */
 {{>generatedAnnotation}}
+
 public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
   protected static final Pattern JSON_MIME_PATTERN = Pattern.compile("(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$");
 

modules/openapi-generator/src/main/resources/Java/libraries/jersey2/JSON.mustache

@@ -22,6 +22,7 @@ import {{javaxPackage}}.ws.rs.core.GenericType;
 import {{javaxPackage}}.ws.rs.ext.ContextResolver;
 
 {{>generatedAnnotation}}
+
 public class JSON implements ContextResolver<ObjectMapper> {
   private ObjectMapper mapper;
 

modules/openapi-generator/src/main/resources/Java/libraries/jersey2/anyof_model.mustache

@@ -119,6 +119,7 @@ public class {{classname}} extends AbstractOpenApiSchema{{#vendorExtensions.x-im
         super("anyOf", {{#isNullable}}Boolean.TRUE{{/isNullable}}{{^isNullable}}Boolean.FALSE{{/isNullable}});
     }
 {{> libraries/jersey2/additional_properties }}
+
     {{#additionalPropertiesType}}
     /**
      * Return true if this {{name}} object is equal to o.

modules/openapi-generator/src/main/resources/Java/libraries/jersey2/api.mustache

@@ -23,6 +23,7 @@ import java.util.List;
 import java.util.Map;
 
 {{>generatedAnnotation}}
+
 {{#operations}}
 public class {{classname}} {
   private ApiClient apiClient;
@@ -205,7 +206,7 @@ public class {{classname}} {
 
   public class API{{operationId}}Request {
     {{#allParams}}
-    {{>nullable_var_annotations}}
+    {{>nullable_var_annotations}}{{! prevent indent}}
     private {{{dataType}}} {{paramName}};
     {{/allParams}}
 

modules/openapi-generator/src/main/resources/Java/libraries/jersey2/apiException.mustache

@@ -13,6 +13,7 @@ import java.util.TreeMap;
  * API Exception
  */
 {{>generatedAnnotation}}
+
 public class ApiException extends{{#useRuntimeException}} RuntimeException {{/useRuntimeException}}{{^useRuntimeException}} Exception {{/useRuntimeException}}{
     private static final long serialVersionUID = 1L;
 

modules/openapi-generator/src/main/resources/Java/libraries/jersey2/auth/ApiKeyAuth.mustache

@@ -10,6 +10,7 @@ import java.util.Map;
 import java.util.List;
 
 {{>generatedAnnotation}}
+
 public class ApiKeyAuth implements Authentication {
   private final String location;
   private final String paramName;

modules/openapi-generator/src/main/resources/Java/libraries/jersey2/auth/Authentication.mustache

@@ -10,6 +10,7 @@ import java.util.Map;
 import java.util.List;
 
 {{>generatedAnnotation}}
+
 public interface Authentication {
     /**
      * Apply authentication settings to header and query params.

modules/openapi-generator/src/main/resources/Java/libraries/jersey2/auth/HttpBasicAuth.mustache

@@ -13,6 +13,7 @@ import java.util.Map;
 import java.util.List;
 
 {{>generatedAnnotation}}
+
 public class HttpBasicAuth implements Authentication {
   private String username;
   private String password;

modules/openapi-generator/src/main/resources/Java/libraries/jersey2/auth/HttpBearerAuth.mustache

@@ -10,6 +10,7 @@ import java.util.Map;
 import java.util.List;
 
 {{>generatedAnnotation}}
+
 public class HttpBearerAuth implements Authentication {
   private final String scheme;
   private String bearerToken;

modules/openapi-generator/src/main/resources/Java/libraries/jersey2/auth/OAuth.mustache

@@ -21,6 +21,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 {{>generatedAnnotation}}
+
 public class OAuth implements Authentication {
     private static final Logger log = Logger.getLogger(OAuth.class.getName());