From ffacdfc9f2990cfe3e450cd4f8029ff49d36578b Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Fri, 21 Aug 2015 23:37:05 -0400 Subject: [PATCH] Revert "Bug 3708 - APIdoc explorer URLs contain extra 'node' in REST calls" This reverts commit 523e75af81fa6537117ceae53c7cdb2b1881aa10. Change-Id: I01ac3d2176f9fcb08151bd35dcd2eed8c961992b Signed-off-by: Thanh Ha --- .../rest/doc/mountpoints/MountPointSwagger.java | 16 +++++++++++----- .../sal/rest/doc/impl/MountPointSwaggerTest.java | 1 - 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/opendaylight/md-sal/sal-rest-docgen/src/main/java/org/opendaylight/controller/sal/rest/doc/mountpoints/MountPointSwagger.java b/opendaylight/md-sal/sal-rest-docgen/src/main/java/org/opendaylight/controller/sal/rest/doc/mountpoints/MountPointSwagger.java index e20e8a79e1..5ed227fd91 100644 --- a/opendaylight/md-sal/sal-rest-docgen/src/main/java/org/opendaylight/controller/sal/rest/doc/mountpoints/MountPointSwagger.java +++ b/opendaylight/md-sal/sal-rest-docgen/src/main/java/org/opendaylight/controller/sal/rest/doc/mountpoints/MountPointSwagger.java @@ -90,19 +90,25 @@ public class MountPointSwagger extends BaseYangSwaggerGenerator implements Mount builder.append(moduleName); builder.append(':'); } + boolean first = true; for (PathArgument arg : key.getPathArguments()) { + String name = arg.getNodeType().getLocalName(); + if (first) { + first = false; + } else { + builder.append('/'); + } + builder.append(name); if (arg instanceof YangInstanceIdentifier.NodeIdentifierWithPredicates) { NodeIdentifierWithPredicates nodeId = (NodeIdentifierWithPredicates) arg; for (Entry entry : nodeId.getKeyValues().entrySet()) { - builder.append(entry.getValue()).append('/'); + builder.append('/').append(entry.getValue()); } - } else { - builder.append(name); - builder.append('/'); } } - return builder.toString(); + + return builder.append('/').toString(); } private String getYangMountUrl(final YangInstanceIdentifier key) { diff --git a/opendaylight/md-sal/sal-rest-docgen/src/test/java/org/opendaylight/controller/sal/rest/doc/impl/MountPointSwaggerTest.java b/opendaylight/md-sal/sal-rest-docgen/src/test/java/org/opendaylight/controller/sal/rest/doc/impl/MountPointSwaggerTest.java index c32a8e3ae7..f21766d9b0 100644 --- a/opendaylight/md-sal/sal-rest-docgen/src/test/java/org/opendaylight/controller/sal/rest/doc/impl/MountPointSwaggerTest.java +++ b/opendaylight/md-sal/sal-rest-docgen/src/test/java/org/opendaylight/controller/sal/rest/doc/impl/MountPointSwaggerTest.java @@ -42,7 +42,6 @@ public class MountPointSwaggerTest { private static final String HTTP_URL = "http://localhost/path"; private static final YangInstanceIdentifier instanceId = YangInstanceIdentifier.builder() .node(QName.create("nodes")) - .node(QName.create("node")) .nodeWithKey(QName.create("node"), QName.create("id"), "123").build(); private static final String INSTANCE_URL = "nodes/node/123/"; private MountPointSwagger swagger; -- 2.36.6