diff --git a/templates-v7/libraries/jersey3/AbstractOpenApiSchema.mustache b/templates-v7/libraries/jersey3/AbstractOpenApiSchema.mustache index b687339c9..eea176c7e 100644 --- a/templates-v7/libraries/jersey3/AbstractOpenApiSchema.mustache +++ b/templates-v7/libraries/jersey3/AbstractOpenApiSchema.mustache @@ -128,11 +128,7 @@ public abstract class AbstractOpenApiSchema { * @return true if it's nullable */ public Boolean isNullable() { - if (Boolean.TRUE.equals(isNullable)) { - return Boolean.TRUE; - } else { - return Boolean.FALSE; - } + return Boolean.TRUE.equals(isNullable); } {{>libraries/jersey2/additional_properties}} diff --git a/templates-v7/libraries/jersey3/JSON.mustache b/templates-v7/libraries/jersey3/JSON.mustache index b5fcf51d7..c3e9f9fa0 100644 --- a/templates-v7/libraries/jersey3/JSON.mustache +++ b/templates-v7/libraries/jersey3/JSON.mustache @@ -28,10 +28,10 @@ import jakarta.ws.rs.ext.ContextResolver; public class JSON implements ContextResolver { private static ObjectMapper mapper; - public JSON() { + private JSON() { mapper = new ObjectMapper(); mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); - JsonMapper.builder().configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, false); + mapper.configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, true); mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); mapper.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, true); mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); @@ -83,7 +83,7 @@ public class JSON implements ContextResolver { public static Class getClassForElement(JsonNode node, Class modelClass) { ClassDiscriminatorMapping cdm = modelDiscriminators.get(modelClass); if (cdm != null) { - return cdm.getClassForElement(node, new HashSet>()); + return cdm.getClassForElement(node, new HashSet<>()); } return null; } @@ -103,7 +103,7 @@ public class JSON implements ContextResolver { ClassDiscriminatorMapping(Class cls, String propertyName, Map> mappings) { modelClass = cls; discriminatorName = propertyName; - discriminatorMappings = new HashMap>(); + discriminatorMappings = new HashMap<>(); if (mappings != null) { discriminatorMappings.putAll(mappings); } @@ -212,12 +212,12 @@ public class JSON implements ContextResolver { /** * A map of discriminators for all model classes. */ - private static Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap, ClassDiscriminatorMapping>(); + private static final Map, ClassDiscriminatorMapping> modelDiscriminators = new HashMap, ClassDiscriminatorMapping>(); /** * A map of oneOf/anyOf descendants for each model class. */ - private static Map, Map> modelDescendants = new HashMap, Map>(); + private static final Map, Map> modelDescendants = new HashMap<>(); /** * Register a model class discriminator.