From e34c8ccc42736c2c59b181c4249421c980a13c33 Mon Sep 17 00:00:00 2001 From: lubos-cicut Date: Mon, 19 Feb 2024 11:24:21 +0100 Subject: [PATCH] OpenAPI: netopeer2 duplicated mapping key When we load netopeer2 modules, OpenAPI in browser returns duplicated mapping key error. This change add discriminator to schemas which are duplicated. JIRA: NETCONF-1254 Change-Id: Ieaa5913bcf56cddbee0dcb2df9ad17cb1af078bd Signed-off-by: lubos-cicut --- .../restconf/openapi/impl/SchemasStream.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/SchemasStream.java b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/SchemasStream.java index 022668a3b8..e3de701dcf 100644 --- a/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/SchemasStream.java +++ b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/impl/SchemasStream.java @@ -184,14 +184,9 @@ public final class SchemasStream extends InputStream { final ArrayDeque result, final String parentName, final boolean isParentConfig) { if (node instanceof ContainerSchemaNode || node instanceof ListSchemaNode) { final var newTitle = title + "_" + node.getQName().getLocalName(); - final String discriminator; - if (!definitionNames.isListedNode(node)) { - final var parentNameConfigLocalName = parentName + "_" + node.getQName().getLocalName(); - final var names = List.of(parentNameConfigLocalName); - discriminator = definitionNames.pickDiscriminator(node, names); - } else { - discriminator = definitionNames.getDiscriminator(node); - } + final var parentNameConfigLocalName = parentName + "_" + node.getQName().getLocalName(); + final var names = List.of(parentNameConfigLocalName); + final var discriminator = definitionNames.pickDiscriminator(node, names); final var child = new NodeSchemaEntity(node, newTitle, discriminator, OBJECT_TYPE, stack, parentName, isParentConfig, definitionNames); final var isConfig = node.isConfiguration() && isParentConfig; -- 2.36.6