From: Jakub Toth Date: Thu, 22 Dec 2016 17:42:45 +0000 (+0100) Subject: Bug 7429 - Upgrade docgen in restconf to the latest draft of ietf-restconf X-Git-Tag: release/carbon~91^2 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=4914063256c8776e3dba65f7573fa6950754501b;p=netconf.git Bug 7429 - Upgrade docgen in restconf to the latest draft of ietf-restconf *upgrade paths from 17 to 18 Change-Id: I885e59c0ddc3a6668514f531fc6025ba2effedb0 Signed-off-by: Jakub Toth --- 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/"); } } 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 453a9d2da4..55c62b24a1 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 @@ -62,7 +62,7 @@ public class BaseYangSwaggerGenerator { protected static final String API_VERSION = "1.0.0"; protected static final String SWAGGER_VERSION = "1.2"; protected static final String RESTCONF_CONTEXT_ROOT = "restconf"; - private static final String RESTCONF_DRAFT = "17"; + private static final String RESTCONF_DRAFT = "18"; static final String MODULE_NAME_SUFFIX = "_module"; protected static final DateFormat SIMPLE_DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd"); @@ -73,14 +73,15 @@ public class BaseYangSwaggerGenerator { private static boolean newDraft; protected BaseYangSwaggerGenerator() { - mapper.registerModule(new JsonOrgModule()); - mapper.configure(SerializationFeature.INDENT_OUTPUT, true); + this.mapper.registerModule(new JsonOrgModule()); + this.mapper.configure(SerializationFeature.INDENT_OUTPUT, true); } /** * Return list of modules converted to swagger compliant resource list. */ - public ResourceList getResourceListing(final UriInfo uriInfo, final SchemaContext schemaContext, final String context) { + public ResourceList getResourceListing(final UriInfo uriInfo, final SchemaContext schemaContext, + final String context) { final ResourceList resourceList = createResourceList(); @@ -94,7 +95,8 @@ public class BaseYangSwaggerGenerator { final String revisionString = SIMPLE_DATE_FORMAT.format(module.getRevision()); final Resource resource = new Resource(); LOG.debug("Working on [{},{}]...", module.getName(), revisionString); - final ApiDeclaration doc = getApiDeclaration(module.getName(), revisionString, uriInfo, schemaContext, context); + final ApiDeclaration doc = + getApiDeclaration(module.getName(), revisionString, uriInfo, schemaContext, context); if (doc != null) { resource.setPath(generatePath(uriInfo, module.getName(), revisionString)); @@ -121,11 +123,12 @@ public class BaseYangSwaggerGenerator { return uri.toASCIIString(); } - public ApiDeclaration getApiDeclaration(final String moduleName, final String revision, final UriInfo uriInfo, final SchemaContext schemaContext, final String context) { + public ApiDeclaration getApiDeclaration(final String moduleName, final String revision, final UriInfo uriInfo, + final SchemaContext schemaContext, final String context) { Date rev = null; try { - if (revision != null && !revision.equals("0000-00-00")) { + if ((revision != null) && !revision.equals("0000-00-00")) { rev = SIMPLE_DATE_FORMAT.parse(revision); } } catch (final ParseException e) { @@ -149,7 +152,8 @@ public class BaseYangSwaggerGenerator { return getApiDeclaration(module, rev, uriInfo, context, schemaContext); } - public ApiDeclaration getApiDeclaration(final Module module, final Date revision, final UriInfo uriInfo, final String context, final SchemaContext schemaContext) { + public ApiDeclaration getApiDeclaration(final Module module, final Date revision, final UriInfo uriInfo, + final String context, final SchemaContext schemaContext) { final String basePath = createBasePathFromUriInfo(uriInfo); final ApiDeclaration doc = getSwaggerDocSpec(module, basePath, context, schemaContext); @@ -165,13 +169,14 @@ public class BaseYangSwaggerGenerator { if (port != -1) { portPart = ":" + port; } - final String basePath = new StringBuilder(uriInfo.getBaseUri().getScheme()).append("://") - .append(uriInfo.getBaseUri().getHost()).append(portPart).append("/").append(RESTCONF_CONTEXT_ROOT) - .toString(); + final String basePath = + new StringBuilder(uriInfo.getBaseUri().getScheme()).append("://").append(uriInfo.getBaseUri().getHost()) + .append(portPart).append("/").append(RESTCONF_CONTEXT_ROOT).toString(); return basePath; } - public ApiDeclaration getSwaggerDocSpec(final Module m, final String basePath, final String context, final SchemaContext schemaContext) { + public ApiDeclaration getSwaggerDocSpec(final Module m, final String basePath, final String context, + final SchemaContext schemaContext) { final ApiDeclaration doc = createApiDeclaration(basePath); final List apis = new ArrayList<>(); @@ -187,15 +192,17 @@ public class BaseYangSwaggerGenerator { String resourcePath; /* - * Only when the node's config statement is true, such apis as GET/PUT/POST/DELETE config - * are added for this node. + * Only when the node's config statement is true, such apis as + * GET/PUT/POST/DELETE config are added for this node. */ - if (node.isConfiguration()) { // This node's config statement is true. + if (node.isConfiguration()) { // This node's config statement is + // true. resourcePath = getDataStorePath("config", context); /* - * When there are two or more top container or list nodes whose config statement is true in module, - * make sure that only one root post link is added for this module. + * When there are two or more top container or list nodes + * whose config statement is true in module, make sure that + * only one root post link is added for this module. */ if (!hasAddRootPostLink) { LOG.debug("Has added root post link for module {}", m.getName()); @@ -228,10 +235,10 @@ public class BaseYangSwaggerGenerator { JSONObject models = null; try { - models = jsonConverter.convertToJsonSchema(m, schemaContext); + models = this.jsonConverter.convertToJsonSchema(m, schemaContext); doc.setModels(models); if (LOG.isDebugEnabled()) { - LOG.debug(mapper.writeValueAsString(doc)); + LOG.debug(this.mapper.writeValueAsString(doc)); } } catch (IOException | JSONException e) { LOG.error("Exception occured in ModelGenerator", e); @@ -243,7 +250,7 @@ public class BaseYangSwaggerGenerator { } private void addRootPostLink(final Module module, final DataNodeContainer node, final List pathParams, - final String resourcePath, final String dataStore, final List apis) { + final String resourcePath, final String dataStore, final List apis) { if (containsListOrContainer(module.getChildNodes())) { final Api apiForRootPostUri = new Api(); apiForRootPostUri.setPath(resourcePath.concat(getContent(dataStore))); @@ -278,8 +285,9 @@ public class BaseYangSwaggerGenerator { return module + "(" + revision + ")"; } - private void addApis(final DataSchemaNode node, final List apis, final String parentPath, final List parentPathParams, - final SchemaContext schemaContext, final boolean addConfigApi, final String parentName, final String dataStore) { + private void addApis(final DataSchemaNode node, final List apis, final String parentPath, + final List parentPathParams, final SchemaContext schemaContext, final boolean addConfigApi, + final String parentName, final String dataStore) { final Api api = new Api(); final List pathParams = new ArrayList<>(parentPathParams); @@ -287,7 +295,7 @@ public class BaseYangSwaggerGenerator { LOG.debug("Adding path: [{}]", resourcePath); api.setPath(resourcePath.concat(getContent(dataStore))); - Iterable childSchemaNodes = Collections.emptySet(); + Iterable childSchemaNodes = Collections. emptySet(); if ((node instanceof ListSchemaNode) || (node instanceof ContainerSchemaNode)) { final DataNodeContainer dataNodeContainer = (DataNodeContainer) node; childSchemaNodes = dataNodeContainer.getChildNodes(); @@ -296,11 +304,12 @@ public class BaseYangSwaggerGenerator { apis.add(api); for (final DataSchemaNode childNode : childSchemaNodes) { - if (childNode instanceof ListSchemaNode || childNode instanceof ContainerSchemaNode) { + if ((childNode instanceof ListSchemaNode) || (childNode instanceof ContainerSchemaNode)) { // keep config and operation attributes separate. if (childNode.isConfiguration() == addConfigApi) { final String newParent = parentName + "/" + node.getQName().getLocalName(); - addApis(childNode, apis, resourcePath, pathParams, schemaContext, addConfigApi, newParent, dataStore); + addApis(childNode, apis, resourcePath, pathParams, schemaContext, addConfigApi, newParent, + dataStore); } } } @@ -319,17 +328,18 @@ public class BaseYangSwaggerGenerator { return ""; } } + private boolean containsListOrContainer(final Iterable nodes) { for (final DataSchemaNode child : nodes) { - if (child instanceof ListSchemaNode || child instanceof ContainerSchemaNode) { + if ((child instanceof ListSchemaNode) || (child instanceof ContainerSchemaNode)) { return true; } } return false; } - private List operation(final DataSchemaNode node, final List pathParams, final boolean isConfig, - final Iterable childSchemaNodes, final String parentName) { + private List operation(final DataSchemaNode node, final List pathParams, + final boolean isConfig, final Iterable childSchemaNodes, final String parentName) { final List operations = new ArrayList<>(); final Get getBuilder = new Get(node, isConfig); @@ -350,8 +360,9 @@ public class BaseYangSwaggerGenerator { return operations; } - private List operationPost(final String name, final String description, final DataNodeContainer dataNodeContainer, - final List pathParams, final boolean isConfig, final String parentName) { + private List operationPost(final String name, final String description, + final DataNodeContainer dataNodeContainer, final List pathParams, final boolean isConfig, + final String parentName) { final List operations = new ArrayList<>(); if (isConfig) { final Post postBuilder = new Post(name, parentName + name, description, dataNodeContainer); @@ -360,7 +371,8 @@ public class BaseYangSwaggerGenerator { return operations; } - private String createPath(final DataSchemaNode schemaNode, final List pathParams, final SchemaContext schemaContext) { + private String createPath(final DataSchemaNode schemaNode, final List pathParams, + final SchemaContext schemaContext) { final ArrayList pathListParams = new ArrayList<>(); final StringBuilder path = new StringBuilder(); final String localName = resolvePathArgumentsName(schemaNode, schemaContext); @@ -378,8 +390,7 @@ public class BaseYangSwaggerGenerator { pathListParams.add(((LeafSchemaNode) dataChildByName)); final String pathParamIdentifier; if (newDraft) { - pathParamIdentifier = keyBuilder.append("{").append(listKey.getLocalName()).append("}") - .toString(); + pathParamIdentifier = keyBuilder.append("{").append(listKey.getLocalName()).append("}").toString(); } else { pathParamIdentifier = "/{" + listKey.getLocalName() + "}"; } @@ -400,7 +411,8 @@ public class BaseYangSwaggerGenerator { return path.toString(); } - protected void addRpcs(final RpcDefinition rpcDefn, final List apis, final String parentPath, final SchemaContext schemaContext) { + protected void addRpcs(final RpcDefinition rpcDefn, final List apis, final String parentPath, + final SchemaContext schemaContext) { final Api rpc = new Api(); final String resourcePath = parentPath + "/" + resolvePathArgumentsName(rpcDefn, schemaContext); rpc.setPath(resourcePath); 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 11a4db0cf4..fcd85c06f2 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 @@ -39,11 +39,11 @@ public class MountPointSwagger extends BaseYangSwaggerGenerator implements Mount private static final String DATASTORES_REVISION = "-"; private static final String DATASTORES_LABEL = "Datastores"; - private static final String RESTCONF_DRAFT = "17"; + private static final String RESTCONF_DRAFT = "18"; private DOMMountPointService mountService; - private final Map instanceIdToLongId = new TreeMap<>( - (o1, o2) -> o1.toString().compareToIgnoreCase(o2.toString())); + private final Map instanceIdToLongId = + new TreeMap<>((o1, o2) -> o1.toString().compareToIgnoreCase(o2.toString())); private final Map longIdToInstanceId = new HashMap<>(); private final Object lock = new Object(); @@ -52,14 +52,14 @@ public class MountPointSwagger extends BaseYangSwaggerGenerator implements Mount private static final AtomicReference selfRef = new AtomicReference<>(); private SchemaService globalSchema; private static boolean newDraft; + public Map getInstanceIdentifiers() { final Map urlToId = new HashMap<>(); - synchronized (lock) { - final SchemaContext context = globalSchema.getGlobalContext(); - for (final Entry entry : instanceIdToLongId.entrySet()) { + synchronized (this.lock) { + final SchemaContext context = this.globalSchema.getGlobalContext(); + for (final Entry entry : this.instanceIdToLongId.entrySet()) { final String modName = findModuleName(entry.getKey(), context); - urlToId.put(generateUrlPrefixFromInstanceID(entry.getKey(), modName), - entry.getValue()); + urlToId.put(generateUrlPrefixFromInstanceID(entry.getKey(), modName), entry.getValue()); } } return urlToId; @@ -83,8 +83,7 @@ public class MountPointSwagger extends BaseYangSwaggerGenerator implements Mount final StringBuilder builder = new StringBuilder(); builder.append("/"); if (moduleName != null) { - builder.append(moduleName) - .append(':'); + builder.append(moduleName).append(':'); } for (final PathArgument arg : key.getPathArguments()) { final String name = arg.getNodeType().getLocalName(); @@ -92,25 +91,20 @@ public class MountPointSwagger extends BaseYangSwaggerGenerator implements Mount final NodeIdentifierWithPredicates nodeId = (NodeIdentifierWithPredicates) arg; for (final Entry entry : nodeId.getKeyValues().entrySet()) { if (newDraft) { - builder.deleteCharAt(builder.length() - 1) - .append("=") - .append(entry.getValue()) - .append('/'); + builder.deleteCharAt(builder.length() - 1).append("=").append(entry.getValue()).append('/'); } else { - builder.append(entry.getValue()) - .append('/'); + builder.append(entry.getValue()).append('/'); } } } else { - builder.append(name) - .append('/'); + builder.append(name).append('/'); } } return builder.toString(); } private String getYangMountUrl(final YangInstanceIdentifier key) { - final String modName = findModuleName(key, globalSchema.getGlobalContext()); + final String modName = findModuleName(key, this.globalSchema.getGlobalContext()); return generateUrlPrefixFromInstanceID(key, modName) + "yang-ext:mount"; } @@ -137,8 +131,8 @@ public class MountPointSwagger extends BaseYangSwaggerGenerator implements Mount private YangInstanceIdentifier getInstanceId(final Long id) { final YangInstanceIdentifier instanceId; - synchronized (lock) { - instanceId = longIdToInstanceId.get(id); + synchronized (this.lock) { + instanceId = this.longIdToInstanceId.get(id); } return instanceId; } @@ -149,7 +143,7 @@ public class MountPointSwagger extends BaseYangSwaggerGenerator implements Mount return null; } - final Optional mountPoint = mountService.getMountPoint(id); + final Optional mountPoint = this.mountService.getMountPoint(id); if (!mountPoint.isPresent()) { return null; } @@ -161,7 +155,8 @@ public class MountPointSwagger extends BaseYangSwaggerGenerator implements Mount return context; } - public ApiDeclaration getMountPointApi(final UriInfo uriInfo, final Long id, final String module, final String revision) { + public ApiDeclaration getMountPointApi(final UriInfo uriInfo, final Long id, final String module, + final String revision) { final YangInstanceIdentifier iid = getInstanceId(id); final SchemaContext context = getSchemaContext(iid); final String urlPrefix = getYangMountUrl(iid); @@ -177,12 +172,11 @@ public class MountPointSwagger extends BaseYangSwaggerGenerator implements Mount private ApiDeclaration generateDataStoreApiDoc(final UriInfo uriInfo, final String context) { final List apis = new LinkedList<>(); - apis.add(createGetApi("config", - "Queries the config (startup) datastore on the mounted hosted.", context)); - apis.add(createGetApi("operational", - "Queries the operational (running) datastore on the mounted hosted.", context)); - apis.add(createGetApi("operations", - "Queries the available operations (RPC calls) on the mounted hosted.", context)); + apis.add(createGetApi("config", "Queries the config (startup) datastore on the mounted hosted.", context)); + apis.add(createGetApi("operational", "Queries the operational (running) datastore on the mounted hosted.", + context)); + apis.add(createGetApi("operations", "Queries the available operations (RPC calls) on the mounted hosted.", + context)); final ApiDeclaration declaration = super.createApiDeclaration(createBasePathFromUriInfo(uriInfo)); declaration.setApis(apis); @@ -209,18 +203,18 @@ public class MountPointSwagger extends BaseYangSwaggerGenerator implements Mount @Override public void onMountPointCreated(final YangInstanceIdentifier path) { - synchronized (lock) { - final Long idLong = idKey.incrementAndGet(); - instanceIdToLongId.put(path, idLong); - longIdToInstanceId.put(idLong, path); + synchronized (this.lock) { + final Long idLong = this.idKey.incrementAndGet(); + this.instanceIdToLongId.put(path, idLong); + this.longIdToInstanceId.put(idLong, path); } } @Override public void onMountPointRemoved(final YangInstanceIdentifier path) { - synchronized (lock) { - final Long id = instanceIdToLongId.remove(path); - longIdToInstanceId.remove(id); + synchronized (this.lock) { + final Long id = this.instanceIdToLongId.remove(path); + this.longIdToInstanceId.remove(id); } } @@ -234,7 +228,7 @@ public class MountPointSwagger extends BaseYangSwaggerGenerator implements Mount return swagger; } - public static MountPointSwagger getInstanceDraft17() { + public static MountPointSwagger getInstanceDraft18() { MountPointSwagger swagger = selfRef.get(); if (swagger == null) { selfRef.compareAndSet(null, new MountPointSwagger()); diff --git a/restconf/sal-rest-docgen/src/main/resources/17/explorer/index.html b/restconf/sal-rest-docgen/src/main/resources/18/explorer/index.html similarity index 78% rename from restconf/sal-rest-docgen/src/main/resources/17/explorer/index.html rename to restconf/sal-rest-docgen/src/main/resources/18/explorer/index.html index d5126dd664..cd76f785d7 100644 --- a/restconf/sal-rest-docgen/src/main/resources/17/explorer/index.html +++ b/restconf/sal-rest-docgen/src/main/resources/18/explorer/index.html @@ -35,38 +35,38 @@ diff --git a/restconf/sal-rest-docgen/src/main/resources/17/explorer/lib/odl/list_mounts.js b/restconf/sal-rest-docgen/src/main/resources/18/explorer/lib/odl/list_mounts.js similarity index 73% rename from restconf/sal-rest-docgen/src/main/resources/17/explorer/lib/odl/list_mounts.js rename to restconf/sal-rest-docgen/src/main/resources/18/explorer/lib/odl/list_mounts.js index b9b4c624be..39e26d069f 100644 --- a/restconf/sal-rest-docgen/src/main/resources/17/explorer/lib/odl/list_mounts.js +++ b/restconf/sal-rest-docgen/src/main/resources/18/explorer/lib/odl/list_mounts.js @@ -4,16 +4,16 @@ var loadMountList = function( dom ) { dom.empty(); dom.append( "

Loading. Please wait...

" ); $.ajax( { - url: "/apidoc/17/apis/mounts", + url: "/apidoc/18/apis/mounts", datatype: 'jsonp', success: function( strData ){ var myData = strData; var list = $( "
" ); for( var key in myData ) { - list.append( "" + - myData[key].instance + ""); + list.append( "" + + myData[key].instance + ""); } dom.empty(); dom.append( list ); diff --git a/restconf/sal-rest-docgen/src/main/resources/17/explorer/static/index.html b/restconf/sal-rest-docgen/src/main/resources/18/explorer/static/index.html similarity index 100% rename from restconf/sal-rest-docgen/src/main/resources/17/explorer/static/index.html rename to restconf/sal-rest-docgen/src/main/resources/18/explorer/static/index.html diff --git a/restconf/sal-rest-docgen/src/main/resources/WEB-INF/web.xml b/restconf/sal-rest-docgen/src/main/resources/WEB-INF/web.xml index 849e2c90e3..e0a37261e9 100644 --- a/restconf/sal-rest-docgen/src/main/resources/WEB-INF/web.xml +++ b/restconf/sal-rest-docgen/src/main/resources/WEB-INF/web.xml @@ -41,7 +41,7 @@ JAXRSApiDoc - /17/apis/* + /18/apis/* @@ -66,7 +66,7 @@ cross-origin-api-doc - /17/apis/* + /18/apis/*