Merge branch 'master' into fork/AnderData/bug/4967-not-required-overrides-annotations

Author: ewaostrowska

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.38 (**current stable**)| 2025-09-29   | 3.x           | [tag v2.2.38](https://github.com/swagger-api/swagger-core/tree/v2.2.38) | Supported
+2.2.39 (**current stable**)| 2025-10-13   | 3.x           | [tag v2.2.39](https://github.com/swagger-api/swagger-core/tree/v2.2.39) | Supported
+2.2.38                     | 2025-09-29   | 3.x           | [tag v2.2.38](https://github.com/swagger-api/swagger-core/tree/v2.2.38) | Supported
 2.2.37                     | 2025-09-16   | 3.x           | [tag v2.2.37](https://github.com/swagger-api/swagger-core/tree/v2.2.37) | Supported
 2.2.36                     | 2025-08-18   | 3.x           | [tag v2.2.36](https://github.com/swagger-api/swagger-core/tree/v2.2.36) | Supported
 2.2.35                     | 2025-07-31   | 3.x           | [tag v2.2.35](https://github.com/swagger-api/swagger-core/tree/v2.2.35) | Supported
@@ -131,7 +132,7 @@ You need the following installed and available in your $PATH:
 * Jackson 2.4.5 or greater
 
 
-### To build from source (currently 2.2.39-SNAPSHOT)
+### To build from source (currently 2.2.40-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.39-SNAPSHOT</version>
+        <version>2.2.40-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.39-SNAPSHOT</version>
+        <version>2.2.40-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/swagger-core/src/main/java/io/swagger/v3/core/converter/AnnotatedType.java

@@ -8,9 +8,11 @@
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;
 import java.util.function.Function;
+import java.util.stream.Collectors;
 
 public class AnnotatedType {
     private Type type;
@@ -155,11 +157,11 @@ public AnnotatedType name(String name) {
     }
 
     public Annotation[] getCtxAnnotations() {
-        return ctxAnnotations;
+        return ctxAnnotations == null ? null : Arrays.copyOf(ctxAnnotations, ctxAnnotations.length);
     }
 
     public void setCtxAnnotations(Annotation[] ctxAnnotations) {
-        this.ctxAnnotations = ctxAnnotations;
+        this.ctxAnnotations = ctxAnnotations == null ? null : Arrays.copyOf(ctxAnnotations, ctxAnnotations.length);
     }
 
     public AnnotatedType ctxAnnotations(Annotation[] ctxAnnotations) {
@@ -241,49 +243,35 @@ public AnnotatedType propertyName(String propertyName) {
         return this;
     }
 
+    private List<Annotation> getProcessedAnnotations(Annotation[] annotations) {
+        if (annotations == null || annotations.length == 0) {
+            return new ArrayList<>();
+        }
+        return Arrays.stream(annotations)
+                .filter(a -> {
+                    String pkg = a.annotationType().getPackage().getName();
+                    return !pkg.startsWith("java.") && !pkg.startsWith("jdk.") && !pkg.startsWith("sun.");
+                })
+                .sorted(Comparator.comparing(a -> a.annotationType().getName()))
+                .collect(Collectors.toList());
+    }
+
     @Override
     public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (!(o instanceof AnnotatedType)) {
-            return false;
-        }
+        if (this == o) return true;
+        if (!(o instanceof AnnotatedType)) return false;
         AnnotatedType that = (AnnotatedType) o;
-
-        if ((type == null && that.type != null) || (type != null && that.type == null)) {
-            return false;
-        }
-
-        if (type != null && that.type != null && !type.equals(that.type)) {
-            return false;
-        }
-        return Arrays.equals(this.ctxAnnotations, that.ctxAnnotations);
+        List<Annotation> thisAnnotatinons = getProcessedAnnotations(this.ctxAnnotations);
+        List<Annotation> thatAnnotatinons = getProcessedAnnotations(that.ctxAnnotations);
+        return  includePropertiesWithoutJSONView == that.includePropertiesWithoutJSONView &&
+                Objects.equals(type, that.type) &&
+                Objects.equals(thisAnnotatinons, thatAnnotatinons) &&
+                Objects.equals(jsonViewAnnotation, that.jsonViewAnnotation);
     }
 
-
     @Override
     public int hashCode() {
-        if (ctxAnnotations == null || ctxAnnotations.length == 0) {
-            return Objects.hash(type, "fixed");
-        }
-        List<Annotation> meaningfulAnnotations = new ArrayList<>();
-
-        boolean hasDifference = false;
-        for (Annotation a: ctxAnnotations) {
-            if(!a.annotationType().getName().startsWith("sun") && !a.annotationType().getName().startsWith("jdk")) {
-                meaningfulAnnotations.add(a);
-            } else {
-                hasDifference = true;
-            }
-        }
-        int result = 1;
-        result = 31 * result + (type == null ? 0 : Objects.hash(type, "fixed"));
-        if (hasDifference) {
-            result = 31 * result + meaningfulAnnotations.hashCode();
-        } else {
-            result = 31 * result + Arrays.hashCode(ctxAnnotations);
-        }
-        return result;
+        List<Annotation> processedAnnotations = getProcessedAnnotations(this.ctxAnnotations);
+        return Objects.hash(type, jsonViewAnnotation, includePropertiesWithoutJSONView, processedAnnotations);
     }
 }

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

@@ -1109,6 +1109,7 @@ public Schema resolve(AnnotatedType annotatedType, ModelConverterContext context
                     }
                 }
 
+                dropRootRefIfComposed(schemaWithCompositionKeys);
             });
 
             if (!composedModelPropertiesAsSibling) {
@@ -1208,6 +1209,38 @@ private Stream<Annotation> getRecordComponentAnnotations(BeanPropertyDefinition
         }
     }
 
+    private void dropRootRefIfComposed(Schema<?> s) {
+        if (s == null || s.get$ref() == null) {
+            return;
+        }
+
+        if (!isComposedSchema(s)) {
+            return;
+        }
+
+        String ref = s.get$ref();
+        if (refMatchesAnyComposedItem(s, ref)) {
+            s.set$ref(null);
+        }
+    }
+
+    private boolean isComposedSchema(Schema<?> s) {
+        return (s.getOneOf() != null && !s.getOneOf().isEmpty())
+                || (s.getAnyOf() != null && !s.getAnyOf().isEmpty())
+                || (s.getAllOf() != null && !s.getAllOf().isEmpty());
+    }
+
+    private boolean refMatchesAnyComposedItem(Schema<?> s, String ref) {
+        return refMatchesInList(s.getOneOf(), ref)
+                || refMatchesInList(s.getAllOf(), ref)
+                || refMatchesInList(s.getAnyOf(), ref);
+    }
+
+    private boolean refMatchesInList(List<Schema> schemas, String ref) {
+        return schemas != null && schemas.stream()
+                .anyMatch(schema -> ref.equals(schema.get$ref()));
+    }
+
     private Boolean isRecordType(BeanPropertyDefinition propDef) {
         try {
             if (propDef.getPrimaryMember() != null) {

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

@@ -3,13 +3,17 @@
 import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class Json {
 
     private static final class ObjectMapperHolder {
         private static final ObjectMapper MAPPER = ObjectMapperFactory.createJson();
     }
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(Json.class);
+
     public static ObjectMapper mapper() {
         return ObjectMapperHolder.MAPPER;
     }
@@ -22,16 +26,17 @@ public static String pretty(Object o) {
         try {
             return pretty().writeValueAsString(o);
         } catch (Exception e) {
-            e.printStackTrace();
+            PrettyPrintHelper.emitError(LOGGER, "Error serializing object to JSON", e);
             return null;
         }
     }
 
     public static void prettyPrint(Object o) {
         try {
-            System.out.println(pretty().writeValueAsString(o).replace("\r", ""));
+            String prettyString = pretty().writeValueAsString(o).replace("\r", "");
+            PrettyPrintHelper.emit(LOGGER, prettyString);
         } catch (Exception e) {
-            e.printStackTrace();
+            PrettyPrintHelper.emitError(LOGGER, "Error pretty-printing JSON", e);
         }
     }
 }

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

@@ -21,7 +21,7 @@ private static final class ConverterMapperHolder {
         private static final ObjectMapper MAPPER = ObjectMapperFactory.createJsonConverter();
     }
 
-    static Logger LOGGER = LoggerFactory.getLogger(Json31.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(Json31.class);
 
     public static ObjectMapper mapper() {
         return ObjectMapperHolder.MAPPER;
@@ -39,16 +39,17 @@ public static String pretty(Object o) {
         try {
             return pretty().writeValueAsString(o);
         } catch (Exception e) {
-            e.printStackTrace();
+            PrettyPrintHelper.emitError(LOGGER, "Error serializing object to JSON (3.1)", e);
             return null;
         }
     }
 
     public static void prettyPrint(Object o) {
         try {
-            System.out.println(pretty().writeValueAsString(o).replace("\r", ""));
+            String prettyString = pretty().writeValueAsString(o).replace("\r", "");
+            PrettyPrintHelper.emit(LOGGER, prettyString);
         } catch (Exception e) {
-            e.printStackTrace();
+            PrettyPrintHelper.emitError(LOGGER, "Error pretty-printing JSON (3.1)", e);
         }
     }
 

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

@@ -0,0 +1,48 @@
+package io.swagger.v3.core.util;
+
+import org.slf4j.Logger;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.function.Consumer;
+
+class PrettyPrintHelper {
+
+    private static final ThreadLocal<Consumer<String>> OVERRIDE = new ThreadLocal<>();
+
+    private PrettyPrintHelper() {
+        // utility class
+    }
+
+    static void setOverride(Consumer<String> consumer) {
+        OVERRIDE.set(consumer);
+    }
+
+    static void clearOverride() {
+        OVERRIDE.remove();
+    }
+
+    static void emit(Logger logger, String message) {
+        Consumer<String> consumer = OVERRIDE.get();
+        if (consumer != null) {
+            consumer.accept(message);
+        } else {
+            logger.debug(message);
+        }
+    }
+
+    static void emitError(Logger logger, String message, Throwable throwable) {
+        Consumer<String> consumer = OVERRIDE.get();
+        if (consumer != null) {
+            StringBuilder builder = new StringBuilder(message);
+            if (throwable != null) {
+                builder.append(System.lineSeparator());
+                StringWriter writer = new StringWriter();
+                throwable.printStackTrace(new PrintWriter(writer));
+                builder.append(writer);
+            }
+            consumer.accept(builder.toString());
+        }
+        logger.error(message, throwable);
+    }
+}

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

@@ -3,13 +3,17 @@
 import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class Yaml {
 
     private static final class ObjectMapperHolder {
         private static final ObjectMapper MAPPER = ObjectMapperFactory.createYaml();
     }
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(Yaml.class);
+
     public static ObjectMapper mapper() {
         return ObjectMapperHolder.MAPPER;
     }
@@ -22,16 +26,17 @@ public static String pretty(Object o) {
         try {
             return pretty().writeValueAsString(o);
         } catch (Exception e) {
-            e.printStackTrace();
+            PrettyPrintHelper.emitError(LOGGER, "Error serializing object to YAML", e);
             return null;
         }
     }
 
     public static void prettyPrint(Object o) {
         try {
-            System.out.println(pretty().writeValueAsString(o));
+            String prettyString = pretty().writeValueAsString(o);
+            PrettyPrintHelper.emit(LOGGER, prettyString);
         } catch (Exception e) {
-            e.printStackTrace();
+            PrettyPrintHelper.emitError(LOGGER, "Error pretty-printing YAML", e);
         }
     }
 }

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

@@ -17,7 +17,7 @@ private static final class ObjectMapperHolder {
     }
 
 
-    static Logger LOGGER = LoggerFactory.getLogger(Yaml31.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(Yaml31.class);
 
     public static ObjectMapper mapper() {
         return ObjectMapperHolder.MAPPER;
@@ -31,16 +31,17 @@ public static String pretty(Object o) {
         try {
             return pretty().writeValueAsString(o);
         } catch (Exception e) {
-            e.printStackTrace();
+            PrettyPrintHelper.emitError(LOGGER, "Error serializing object to YAML (3.1)", e);
             return null;
         }
     }
 
     public static void prettyPrint(Object o) {
         try {
-            System.out.println(pretty().writeValueAsString(o));
+            String prettyString = pretty().writeValueAsString(o);
+            PrettyPrintHelper.emit(LOGGER, prettyString);
         } catch (Exception e) {
-            e.printStackTrace();
+            PrettyPrintHelper.emitError(LOGGER, "Error pretty-printing YAML (3.1)", e);
         }
     }
 
@@ -60,4 +61,5 @@ public static Map<String, Object> jsonSchemaAsMap(Schema schema) {
             LOGGER.error("Exception converting jsonSchema to Map", e);
             return null;
         }
-    }}
+    }
+}