Merge branch 'master' into fix-annotation-utils-cache-misses

Author: ldt-fweichert

README.md

@@ -23,7 +23,8 @@ The OpenAPI Specification has undergone several revisions since initial creation
 
 Swagger core Version      | Release Date | OpenAPI Spec compatibility | Notes | Status
 ------------------------- | ------------ | -------------------------- | ----- | ----
-2.2.45 (**current stable**)| 2026-03-09   | 3.x           | [tag v2.2.45](https://github.com/swagger-api/swagger-core/tree/v2.2.45) | Supported
+2.2.46 (**current stable**)| 2026-03-31   | 3.x           | [tag v2.2.46](https://github.com/swagger-api/swagger-core/tree/v2.2.46) | Supported
+2.2.45                     | 2026-03-09   | 3.x           | [tag v2.2.45](https://github.com/swagger-api/swagger-core/tree/v2.2.45) | Supported
 2.2.44                     | 2026-03-03   | 3.x           | [tag v2.2.44](https://github.com/swagger-api/swagger-core/tree/v2.2.44) | Supported
 2.2.43                     | 2026-02-17   | 3.x           | [tag v2.2.43](https://github.com/swagger-api/swagger-core/tree/v2.2.43) | Supported
 2.2.42                     | 2026-01-19   | 3.x           | [tag v2.2.42](https://github.com/swagger-api/swagger-core/tree/v2.2.42) | Supported
@@ -138,7 +139,7 @@ You need the following installed and available in your $PATH:
 * Jackson 2.4.5 or greater
 
 
-### To build from source (currently 2.2.46-SNAPSHOT)
+### To build from source (currently 2.2.47-SNAPSHOT)
 ```
 # first time building locally
 mvn -N

modules/swagger-annotations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger.core.v3</groupId>
         <artifactId>swagger-project</artifactId>
-        <version>2.2.46-SNAPSHOT</version>
+        <version>2.2.47-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/swagger-core/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger.core.v3</groupId>
         <artifactId>swagger-project</artifactId>
-        <version>2.2.46-SNAPSHOT</version>
+        <version>2.2.47-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/swagger-core/src/main/java/io/swagger/v3/core/jackson/ModelResolver.java

@@ -786,7 +786,7 @@ public static Optional<Schema> getSchemaFromAnnotation(
             schemaObject.setExamples(parseExamplesArray(schema));
         }
 
-        if (!DEFAULT_SENTINEL.equals(schema.defaultValue())){
+        if (schema.defaultValue() != null && !DEFAULT_SENTINEL.equals(schema.defaultValue())) {
             setDefaultSchema(schema, openapi31, schemaObject);
         }
         if (StringUtils.isNotBlank(schema.example()) &&

modules/swagger-core/src/main/java/io/swagger/v3/core/util/AnnotationsUtils.java

@@ -3,14 +3,15 @@
 import io.swagger.v3.core.converter.ModelConverters;
 import io.swagger.v3.core.converter.ResolvedSchema;
 import io.swagger.v3.core.oas.models.ModelWithArrayOfSubclasses;
+import io.swagger.v3.core.util.Json;
 import io.swagger.v3.core.util.Json31;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
+
+import io.swagger.v3.core.util.ResourceUtils;
 import org.testng.annotations.Test;
 
-import java.nio.file.Files;
-import java.nio.file.Paths;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.JsonNode;
 
@@ -21,7 +22,7 @@ public class ArrayOfSubclassTest {
     public void extractSubclassArray_oas31() throws Exception {
         ResolvedSchema schema = ModelConverters.getInstance(true).readAllAsResolvedSchema(ModelWithArrayOfSubclasses.Holder.class);
         assertNotNull(schema);
-        String expectedJson = new String(Files.readAllBytes(Paths.get("src/test/resources/converting/ArrayOfSubclassTest_expected31.json")));
+        String expectedJson = ResourceUtils.loadClassResource(getClass(), "converting/ArrayOfSubclassTest_expected31.json");
         String actualJson = Json31.pretty(schema);
         ObjectMapper mapper = new ObjectMapper();
         JsonNode expectedNode = mapper.readTree(expectedJson);
@@ -33,8 +34,8 @@ public void extractSubclassArray_oas31() throws Exception {
     public void extractSubclassArray_oas30() throws Exception {
         ResolvedSchema schema = ModelConverters.getInstance(false).readAllAsResolvedSchema(ModelWithArrayOfSubclasses.Holder.class);
         assertNotNull(schema);
-        String expectedJson = new String(Files.readAllBytes(Paths.get("src/test/resources/converting/ArrayOfSubclassTest_expected30.json")));
-        String actualJson = Json31.pretty(schema);
+        String expectedJson = ResourceUtils.loadClassResource(getClass(), "converting/ArrayOfSubclassTest_expected30.json");
+        String actualJson = Json.pretty(schema);
         ObjectMapper mapper = new ObjectMapper();
         JsonNode expectedNode = mapper.readTree(expectedJson);
         JsonNode actualNode = mapper.readTree(actualJson);

modules/swagger-core/src/test/java/io/swagger/v3/core/converting/ArrayOfSubclassTest.java

@@ -2,6 +2,8 @@
 
 import io.swagger.v3.core.converter.AnnotatedType;
 import io.swagger.v3.core.converter.ModelConverterContextImpl;
+import io.swagger.v3.core.converter.ModelConverters;
+import io.swagger.v3.core.converter.ResolvedSchema;
 import io.swagger.v3.core.jackson.ModelResolver;
 import io.swagger.v3.core.util.Configuration;
 import io.swagger.v3.core.util.Json;
@@ -10,6 +12,7 @@
 import org.testng.annotations.Test;
 
 import javax.annotation.Nullable;
+import java.util.List;
 import java.util.Set;
 
 import static org.testng.Assert.*;
@@ -18,11 +21,11 @@
  * Reproduces GitHub Issue #5001
  * Native support for @Nullable annotations to generate proper nullable types
  *
- * Tests that @Nullable annotation is recognized and generates appropriate nullable output:
+ * <p>Tests that @Nullable annotation is recognized and generates appropriate nullable output:
  * - OAS 3.0: nullable keyword
  * - OAS 3.1: type array with "null"
  *
- * Note: This test uses javax.annotation.Nullable which is automatically transformed to
+ * <p>Note: This test uses javax.annotation.Nullable which is automatically transformed to
  * jakarta.annotation.Nullable in the swagger-core-jakarta module via the Eclipse Transformer.
  *
  * @see <a href="https://github.com/swagger-api/swagger-core/issues/5001">...</a>
@@ -33,7 +36,7 @@ public class Issue5001Test {
      * Tests @Nullable annotation with OAS 3.1 (type array output)
      */
     @Test
-    public void testNullableWithOAS31() throws Exception {
+    public void testNullableWithOAS31() {
         final ModelResolver modelResolver = new ModelResolver(Json31.mapper());
         Configuration configuration = new Configuration();
         configuration.setOpenAPI31(true);
@@ -72,7 +75,7 @@ public void testNullableWithOAS31() throws Exception {
      * Tests @Nullable annotation with OAS 3.0 (nullable keyword output)
      */
     @Test
-    public void testNullableWithOAS30() throws Exception {
+    public void testNullableWithOAS30() {
         final ModelResolver modelResolver = new ModelResolver(Json.mapper());
         Configuration configuration = new Configuration();
         configuration.setOpenAPI31(false);
@@ -103,7 +106,7 @@ public void testNullableWithOAS30() throws Exception {
      * Tests explicit @Schema annotations with OAS 3.1
      */
     @Test
-    public void testExplicitSchemaAnnotationsWithOAS31() throws Exception {
+    public void testExplicitSchemaAnnotationsWithOAS31() {
         final ModelResolver modelResolver = new ModelResolver(Json31.mapper());
         Configuration configuration = new Configuration();
         configuration.setOpenAPI31(true);