From f17385e68a590b369cec43752af7f5b42943908b Mon Sep 17 00:00:00 2001 From: Ivan Hrasko Date: Tue, 15 Jun 2021 09:46:05 +0200 Subject: [PATCH] Fix multiple keys path in RFC8040 swagger ListPathBuilder for RFC8040 needs to change its state when processing multiple keys (= to ,) thus we have to create it before the iteration over all list keys. JIRA: NETCONF-708 Change-Id: If617ff1508e63b1001ab7857e3b3fdebff287f74 Signed-off-by: Ivan Hrasko Signed-off-by: Robert Varga --- .../netconf/sal/rest/doc/impl/BaseYangSwaggerGenerator.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/BaseYangSwaggerGenerator.java b/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/BaseYangSwaggerGenerator.java index bccb71eb63..074e043049 100644 --- a/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/BaseYangSwaggerGenerator.java +++ b/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/BaseYangSwaggerGenerator.java @@ -537,9 +537,8 @@ public abstract class BaseYangSwaggerGenerator { path.append(localName); if (schemaNode instanceof ListSchemaNode) { - final List listKeys = ((ListSchemaNode) schemaNode).getKeyDefinition(); - for (final QName listKey : listKeys) { - final ListPathBuilder keyBuilder = newListPathBuilder(); + final ListPathBuilder keyBuilder = newListPathBuilder(); + for (final QName listKey : ((ListSchemaNode) schemaNode).getKeyDefinition()) { final String paramName = createUniquePathParamName(listKey.getLocalName(), pathParams); final String pathParamIdentifier = keyBuilder.nextParamIdentifier(paramName); -- 2.36.6