X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=restconf%2Fsal-rest-docgen%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fnetconf%2Fsal%2Frest%2Fdoc%2Fimpl%2FApiDocServiceImpl.java;h=ea70f2655170981a9ffa084765595ef312beb3e8;hb=4914063256c8776e3dba65f7573fa6950754501b;hp=db884580081f64fb2e524928ee81ec3403be9564;hpb=3c03dd6d9a59a737293cad70062b5a0a7bd8e4a8;p=netconf.git diff --git a/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/ApiDocServiceImpl.java b/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/ApiDocServiceImpl.java index db88458008..ea70f26551 100644 --- a/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/ApiDocServiceImpl.java +++ b/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/ApiDocServiceImpl.java @@ -20,12 +20,13 @@ import org.opendaylight.netconf.sal.rest.doc.swagger.ApiDeclaration; import org.opendaylight.netconf.sal.rest.doc.swagger.ResourceList; /** - * This service generates swagger (See https://helloreverb.com/developers/swagger) compliant documentation for * RESTCONF APIs. The output of this is used by embedded Swagger UI. * - *

NOTE: These API's need to be synchronized due to bug 1198. Thread access to + *

+ * NOTE: These API's need to be synchronized due to bug 1198. Thread access to * the SchemaContext is not synchronized properly and thus you can end up with * missing definitions without this synchronization. There are likely otherways * to work around this limitation, but given that this API is a dev only tool @@ -77,9 +78,7 @@ public class ApiDocServiceImpl implements ApiDocService { */ @Override public synchronized Response getApiExplorer(final UriInfo uriInfo) { - return Response - .seeOther(uriInfo.getBaseUriBuilder().path("../explorer/index.html").build()) - .build(); + return Response.seeOther(uriInfo.getBaseUriBuilder().path("../explorer/index.html").build()).build(); } @Override @@ -88,8 +87,8 @@ public class ApiDocServiceImpl implements ApiDocService { try (OutputStreamWriter streamWriter = new OutputStreamWriter(baos, StandardCharsets.UTF_8)) { final JSONWriter writer = new JSONWriter(streamWriter); writer.array(); - for (final Entry entry : MountPointSwagger.getInstance() - .getInstanceIdentifiers().entrySet()) { + for (final Entry entry : MountPointSwagger.getInstance().getInstanceIdentifiers() + .entrySet()) { writer.object(); writer.key("instance").value(entry.getKey()); writer.key("id").value(entry.getValue()); @@ -106,30 +105,28 @@ public class ApiDocServiceImpl implements ApiDocService { public synchronized Response getMountRootDoc(final String instanceNum, final UriInfo uriInfo) { final ResourceList resourceList; if (isNew(uriInfo)) { - resourceList = MountPointSwagger.getInstanceDraft17().getResourceList(uriInfo, - Long.parseLong(instanceNum)); + resourceList = MountPointSwagger.getInstanceDraft18().getResourceList(uriInfo, Long.parseLong(instanceNum)); } else { - resourceList = MountPointSwagger.getInstance().getResourceList(uriInfo, - Long.parseLong(instanceNum)); + resourceList = MountPointSwagger.getInstance().getResourceList(uriInfo, Long.parseLong(instanceNum)); } return Response.ok(resourceList).build(); } @Override public synchronized Response getMountDocByModule(final String instanceNum, final String module, - final String revision, final UriInfo uriInfo) { + final String revision, final UriInfo uriInfo) { final ApiDeclaration api; if (isNew(uriInfo)) { - api = MountPointSwagger.getInstanceDraft17().getMountPointApi(uriInfo, - Long.parseLong(instanceNum), module, revision); + api = MountPointSwagger.getInstanceDraft18().getMountPointApi(uriInfo, Long.parseLong(instanceNum), module, + revision); } else { - api = MountPointSwagger.getInstance().getMountPointApi(uriInfo, - Long.parseLong(instanceNum), module, revision); + api = MountPointSwagger.getInstance().getMountPointApi(uriInfo, Long.parseLong(instanceNum), module, + revision); } return Response.ok(api).build(); } private static boolean isNew(final UriInfo uriInfo) { - return uriInfo.getBaseUri().toString().contains("/17/"); + return uriInfo.getBaseUri().toString().contains("/18/"); } }