From deb81986a6a314b95137c3809c93d511e827bd3f Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 9 Apr 2019 15:28:14 +0200 Subject: [PATCH] Reduce use of getDataChildByName() findDataChildByName() is a better replacement, use that instead. Change-Id: I8e6be2dfd68c1146c231e8381ce16d64a35896ce Signed-off-by: Robert Varga --- .../sal/rest/doc/impl/BaseYangSwaggerGenerator.java | 7 +++++-- .../sal/rest/doc/mountpoints/MountPointSwagger.java | 4 ++-- 2 files changed, 7 insertions(+), 4 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 a47f502316..2bf48cac4f 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 @@ -362,14 +362,17 @@ public abstract class BaseYangSwaggerGenerator { final List listKeys = ((ListSchemaNode) schemaNode).getKeyDefinition(); for (final QName listKey : listKeys) { final ListPathBuilder keyBuilder = newListPathBuilder(); - final DataSchemaNode dataChildByName = ((DataNodeContainer) schemaNode).getDataChildByName(listKey); final String pathParamIdentifier = keyBuilder.nextParamIdentifier(listKey.getLocalName()); path.append(pathParamIdentifier); final Parameter pathParam = new Parameter(); pathParam.setName(listKey.getLocalName()); - pathParam.setDescription(dataChildByName.getDescription().orElse(null)); + + ((DataNodeContainer) schemaNode).findDataChildByName(listKey).ifPresent(listKeyNode -> { + listKeyNode.getDescription().ifPresent(pathParam::setDescription); + }); + pathParam.setType("string"); pathParam.setParamType("path"); diff --git a/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/mountpoints/MountPointSwagger.java b/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/mountpoints/MountPointSwagger.java index a29a9a0404..ad79f153fe 100644 --- a/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/mountpoints/MountPointSwagger.java +++ b/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/mountpoints/MountPointSwagger.java @@ -85,10 +85,10 @@ public class MountPointSwagger implements DOMMountPointListener, AutoCloseable { return urlToId; } - private String findModuleName(final YangInstanceIdentifier id, final SchemaContext context) { + private static String findModuleName(final YangInstanceIdentifier id, final SchemaContext context) { final PathArgument rootQName = id.getPathArguments().iterator().next(); for (final Module mod : context.getModules()) { - if (mod.getDataChildByName(rootQName.getNodeType()) != null) { + if (mod.findDataChildByName(rootQName.getNodeType()).isPresent()) { return mod.getName(); } } -- 2.36.6