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=3149551c50fb58e410fcb743b6591705ef90d7a8;hb=refs%2Fchanges%2F68%2F105868%2F2;hp=2f22fa9a426bc5db11d82f021d0523f99f4a9c68;hpb=ddfdd7b56162e9c45639388b10407d45f5f0ba13;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 2f22fa9a42..3149551c50 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
@@ -7,17 +7,26 @@
*/
package org.opendaylight.netconf.sal.rest.doc.impl;
-import java.io.ByteArrayOutputStream;
-import java.io.OutputStreamWriter;
-import java.nio.charset.StandardCharsets;
-import java.util.Map.Entry;
+import static java.util.Objects.requireNonNull;
+
+import com.google.common.annotations.VisibleForTesting;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import javax.inject.Inject;
+import javax.inject.Singleton;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
-import org.json.JSONWriter;
+import org.opendaylight.mdsal.dom.api.DOMMountPointService;
+import org.opendaylight.mdsal.dom.api.DOMSchemaService;
import org.opendaylight.netconf.sal.rest.doc.api.ApiDocService;
-import org.opendaylight.netconf.sal.rest.doc.mountpoints.MountPointSwagger;
-import org.opendaylight.netconf.sal.rest.doc.swagger.ApiDeclaration;
-import org.opendaylight.netconf.sal.rest.doc.swagger.ResourceList;
+import org.opendaylight.netconf.sal.rest.doc.mountpoints.MountPointOpenApi;
+import org.opendaylight.netconf.sal.rest.doc.openapi.MountPointInstance;
+import org.opendaylight.netconf.sal.rest.doc.openapi.OpenApiObject;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
+
/**
* This service generates swagger (See
@@ -32,30 +41,45 @@ import org.opendaylight.netconf.sal.rest.doc.swagger.ResourceList;
* to work around this limitation, but given that this API is a dev only tool
* and not dependent UI, this was the fastest work around.
*/
-public class ApiDocServiceImpl implements ApiDocService {
+@Component
+@Singleton
+public final class ApiDocServiceImpl implements ApiDocService {
+ // FIXME: make this configurable
+ public static final int DEFAULT_PAGESIZE = 20;
+
+ // Query parameter
+ private static final String PAGE_NUM = "pageNum";
- private static final ApiDocService INSTANCE = new ApiDocServiceImpl();
+ private final MountPointOpenApi mountPointOpenApiRFC8040;
+ private final ApiDocGeneratorRFC8040 apiDocGeneratorRFC8040;
- public static ApiDocService getInstance() {
- return INSTANCE;
+ @Inject
+ @Activate
+ public ApiDocServiceImpl(final @Reference DOMSchemaService schemaService,
+ final @Reference DOMMountPointService mountPointService) {
+ this(new MountPointOpenApiGeneratorRFC8040(schemaService, mountPointService),
+ new ApiDocGeneratorRFC8040(schemaService));
}
- /**
- * Generates index document for Swagger UI. This document lists out all
- * modules with link to get APIs for each module. The API for each module is
- * served by getDocByModule()
method.
- */
- @Override
- public synchronized Response getRootDoc(final UriInfo uriInfo) {
- final ApiDocGenerator generator = ApiDocGenerator.getInstance();
- if (isNew(uriInfo)) {
- generator.setDraft(true);
- } else {
- generator.setDraft(false);
- }
- final ResourceList rootDoc = generator.getResourceListing(uriInfo);
+ public ApiDocServiceImpl(final DOMSchemaService schemaService,
+ final DOMMountPointService mountPointService,
+ final String basePath) {
+ this(new MountPointOpenApiGeneratorRFC8040(schemaService, mountPointService, basePath),
+ new ApiDocGeneratorRFC8040(schemaService, basePath));
+ }
- return Response.ok(rootDoc).build();
+ @VisibleForTesting
+ ApiDocServiceImpl(final MountPointOpenApiGeneratorRFC8040 mountPointOpenApiGeneratorRFC8040,
+ final ApiDocGeneratorRFC8040 apiDocGeneratorRFC8040) {
+ mountPointOpenApiRFC8040 = requireNonNull(mountPointOpenApiGeneratorRFC8040).getMountPointOpenApi();
+ this.apiDocGeneratorRFC8040 = requireNonNull(apiDocGeneratorRFC8040);
+ }
+
+ @Override
+ public synchronized Response getAllModulesDoc(final UriInfo uriInfo) {
+ final DefinitionNames definitionNames = new DefinitionNames();
+ final OpenApiObject doc = apiDocGeneratorRFC8040.getAllModulesDoc(uriInfo, definitionNames);
+ return Response.ok(doc).build();
}
/**
@@ -63,14 +87,9 @@ public class ApiDocServiceImpl implements ApiDocService {
*/
@Override
public synchronized Response getDocByModule(final String module, final String revision, final UriInfo uriInfo) {
- final ApiDocGenerator generator = ApiDocGenerator.getInstance();
- if (isNew(uriInfo)) {
- generator.setDraft(true);
- } else {
- generator.setDraft(false);
- }
- final ApiDeclaration doc = generator.getApiDeclaration(module, revision, uriInfo);
- return Response.ok(doc).build();
+ return Response.ok(
+ apiDocGeneratorRFC8040.getApiDeclaration(module, revision, uriInfo))
+ .build();
}
/**
@@ -81,53 +100,29 @@ public class ApiDocServiceImpl implements ApiDocService {
return Response.seeOther(uriInfo.getBaseUriBuilder().path("../explorer/index.html").build()).build();
}
- @SuppressWarnings("checkstyle:IllegalCatch")
@Override
public synchronized Response getListOfMounts(final UriInfo uriInfo) {
- final ByteArrayOutputStream baos = new ByteArrayOutputStream();
- 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()) {
- writer.object();
- writer.key("instance").value(entry.getKey());
- writer.key("id").value(entry.getValue());
- writer.endObject();
- }
- writer.endArray();
- } catch (final Exception e) {
- return Response.status(500).entity(e.getMessage()).build();
- }
- return Response.status(200).entity(baos.toString()).build();
- }
-
- @Override
- public synchronized Response getMountRootDoc(final String instanceNum, final UriInfo uriInfo) {
- final ResourceList resourceList;
- if (isNew(uriInfo)) {
- resourceList = MountPointSwagger.getInstanceDraft18().getResourceList(uriInfo, Long.parseLong(instanceNum));
- } else {
- resourceList = MountPointSwagger.getInstance().getResourceList(uriInfo, Long.parseLong(instanceNum));
- }
- return Response.ok(resourceList).build();
+ final List entity = mountPointOpenApiRFC8040
+ .getInstanceIdentifiers().entrySet().stream()
+ .map(MountPointInstance::new).collect(Collectors.toList());
+ return Response.ok(entity).build();
}
@Override
public synchronized Response getMountDocByModule(final String instanceNum, final String module,
- final String revision, final UriInfo uriInfo) {
- final ApiDeclaration api;
- if (isNew(uriInfo)) {
- api = MountPointSwagger.getInstanceDraft18().getMountPointApi(uriInfo, Long.parseLong(instanceNum), module,
- revision);
- } else {
- api = MountPointSwagger.getInstance().getMountPointApi(uriInfo, Long.parseLong(instanceNum), module,
- revision);
- }
+ final String revision, final UriInfo uriInfo) {
+ final OpenApiObject api = mountPointOpenApiRFC8040.getMountPointApi(uriInfo, Long.parseLong(instanceNum),
+ module, revision);
return Response.ok(api).build();
}
- private static boolean isNew(final UriInfo uriInfo) {
- return uriInfo.getBaseUri().toString().contains("/18/");
+ @Override
+ public synchronized Response getMountDoc(final String instanceNum, final UriInfo uriInfo) {
+ final String stringPageNum = uriInfo.getQueryParameters().getFirst(PAGE_NUM);
+ final Optional pageNum = stringPageNum != null ? Optional.of(Integer.valueOf(stringPageNum))
+ : Optional.empty();
+ final OpenApiObject api = mountPointOpenApiRFC8040.getMountPointApi(uriInfo,
+ Long.parseLong(instanceNum), pageNum);
+ return Response.ok(api).build();
}
}