mirror of
https://github.com/datahub-project/datahub.git
synced 2025-08-23 08:38:02 +00:00
Fixed a bug where the OpenAPI V3 spec was incorrect. The bug was introduced in https://github.com/datahub-project/datahub/pull/10939. (#10974)
This commit is contained in:
parent
123e84cfed
commit
f0f226cbc1
@ -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.Components;
|
||||||
import io.swagger.v3.oas.models.OpenAPI;
|
import io.swagger.v3.oas.models.OpenAPI;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
|
import java.util.LinkedHashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@ -150,6 +151,11 @@ public class SpringWebConfig implements WebMvcConfigurer {
|
|||||||
: b.get() == null
|
: b.get() == null
|
||||||
? a.get()
|
? a.get()
|
||||||
: Stream.concat(a.get().entrySet().stream(), b.get().entrySet().stream())
|
: 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));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user