From f0f226cbc19ca5280e7bf6a5c6aa13cc1c503ba3 Mon Sep 17 00:00:00 2001
From: Ajoy Majumdar <ajoymajumdar@hotmail.com>
Date: Tue, 23 Jul 2024 17:35:51 -0700
Subject: [PATCH] Fixed a bug where the OpenAPI V3 spec was incorrect. The bug
 was introduced in https://github.com/datahub-project/datahub/pull/10939.
 (#10974)

---
 .../io/datahubproject/openapi/config/SpringWebConfig.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/SpringWebConfig.java b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/SpringWebConfig.java
index 09a6cc7c1e..61c641e358 100644
--- a/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/SpringWebConfig.java
+++ b/metadata-service/openapi-servlet/src/main/java/io/datahubproject/openapi/config/SpringWebConfig.java
@@ -16,6 +16,7 @@ import io.swagger.v3.oas.annotations.servers.Server;
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
 import java.util.Collections;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -150,6 +151,11 @@ public class SpringWebConfig implements WebMvcConfigurer {
         : b.get() == null
             ? a.get()
             : Stream.concat(a.get().entrySet().stream(), b.get().entrySet().stream())
-                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+                .collect(
+                    Collectors.toMap(
+                        Map.Entry::getKey,
+                        Map.Entry::getValue,
+                        (v1, v2) -> v2,
+                        LinkedHashMap::new));
   }
 }