import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.datatype.jsonorg.JsonOrgModule;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.base.Preconditions;
import java.io.IOException;
import java.net.URI;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
+import java.time.format.DateTimeParseException;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Calendar;
import java.util.Collection;
import java.util.Collections;
-import java.util.Date;
-import java.util.GregorianCalendar;
import java.util.List;
+import java.util.Optional;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
import javax.ws.rs.core.UriInfo;
-import org.json.JSONException;
-import org.json.JSONObject;
import org.opendaylight.netconf.sal.rest.doc.model.builder.OperationBuilder;
import org.opendaylight.netconf.sal.rest.doc.model.builder.OperationBuilder.Delete;
import org.opendaylight.netconf.sal.rest.doc.model.builder.OperationBuilder.Get;
import org.opendaylight.netconf.sal.rest.doc.swagger.Resource;
import org.opendaylight.netconf.sal.rest.doc.swagger.ResourceList;
import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.Revision;
import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
import org.opendaylight.yangtools.yang.model.api.DataNodeContainer;
import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
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");
private final ModelGenerator jsonConverter = new ModelGenerator();
// private Map<String, ApiDeclaration> MODULE_DOC_CACHE = new HashMap<>()
private static boolean newDraft;
protected BaseYangSwaggerGenerator() {
- this.mapper.registerModule(new JsonOrgModule());
this.mapper.configure(SerializationFeature.INDENT_OUTPUT, true);
}
LOG.info("Modules found [{}]", modules.size());
for (final Module module : modules) {
- final String revisionString = SIMPLE_DATE_FORMAT.format(module.getRevision());
+ final String revisionString = module.getQNameModule().getRevision().map(Revision::toString).orElse(null);
final Resource resource = new Resource();
LOG.debug("Working on [{},{}]...", module.getName(), revisionString);
final ApiDeclaration doc =
public ApiDeclaration getApiDeclaration(final String moduleName, final String revision, final UriInfo uriInfo,
final SchemaContext schemaContext, final String context) {
- Date rev = null;
+ final Optional<Revision> rev;
try {
- if ((revision != null) && !revision.equals("0000-00-00")) {
- rev = SIMPLE_DATE_FORMAT.parse(revision);
- }
- } catch (final ParseException e) {
+ rev = Revision.ofNullable(revision);
+ } catch (final DateTimeParseException e) {
throw new IllegalArgumentException(e);
}
- if (rev != null) {
- final Calendar cal = new GregorianCalendar();
-
- cal.setTime(rev);
-
- if (cal.get(Calendar.YEAR) < 1970) {
- rev = null;
- }
- }
-
- final Module module = schemaContext.findModuleByName(moduleName, rev);
+ final Module module = schemaContext.findModule(moduleName, rev).orElse(null);
Preconditions.checkArgument(module != null,
"Could not find module by name,revision: " + moduleName + "," + revision);
- return getApiDeclaration(module, rev, uriInfo, context, schemaContext);
+ return getApiDeclaration(module, uriInfo, context, schemaContext);
}
- public ApiDeclaration getApiDeclaration(final Module module, final Date revision, final UriInfo uriInfo,
+ public ApiDeclaration getApiDeclaration(final Module module, final UriInfo uriInfo,
final String context, final SchemaContext schemaContext) {
final String basePath = createBasePathFromUriInfo(uriInfo);
return basePath;
}
- public ApiDeclaration getSwaggerDocSpec(final Module m, final String basePath, final String context,
- final SchemaContext schemaContext) {
+ public ApiDeclaration getSwaggerDocSpec(final Module module, final String basePath, final String context,
+ final SchemaContext schemaContext) {
final ApiDeclaration doc = createApiDeclaration(basePath);
final List<Api> apis = new ArrayList<>();
boolean hasAddRootPostLink = false;
- final Collection<DataSchemaNode> dataSchemaNodes = m.getChildNodes();
+ final Collection<DataSchemaNode> dataSchemaNodes = module.getChildNodes();
LOG.debug("child nodes size [{}]", dataSchemaNodes.size());
for (final DataSchemaNode node : dataSchemaNodes) {
- if ((node instanceof ListSchemaNode) || (node instanceof ContainerSchemaNode)) {
+ if (node instanceof ListSchemaNode || node instanceof ContainerSchemaNode) {
LOG.debug("Is Configuration node [{}] [{}]", node.isConfiguration(), node.getQName().getLocalName());
List<Parameter> pathParams = new ArrayList<>();
* only one root post link is added for this module.
*/
if (!hasAddRootPostLink) {
- LOG.debug("Has added root post link for module {}", m.getName());
- addRootPostLink(m, (DataNodeContainer) node, pathParams, resourcePath, "config", apis);
+ LOG.debug("Has added root post link for module {}", module.getName());
+ addRootPostLink(module, (DataNodeContainer) node, pathParams, resourcePath, "config", apis);
hasAddRootPostLink = true;
}
- addApis(node, apis, resourcePath, pathParams, schemaContext, true, m.getName(), "config");
+ addApis(node, apis, resourcePath, pathParams, schemaContext, true, module.getName(), "config");
}
pathParams = new ArrayList<>();
resourcePath = getDataStorePath("operational", context);
- addApis(node, apis, resourcePath, pathParams, schemaContext, false, m.getName(), "operational");
+ addApis(node, apis, resourcePath, pathParams, schemaContext, false, module.getName(), "operational");
}
}
- final Set<RpcDefinition> rpcs = m.getRpcs();
+ final Set<RpcDefinition> rpcs = module.getRpcs();
for (final RpcDefinition rpcDefinition : rpcs) {
final String resourcePath;
resourcePath = getDataStorePath("operations", context);
if (!apis.isEmpty()) {
doc.setApis(apis);
- JSONObject models = null;
+ ObjectNode models = null;
try {
- models = this.jsonConverter.convertToJsonSchema(m, schemaContext);
+ models = this.jsonConverter.convertToJsonSchema(module, schemaContext);
doc.setModels(models);
if (LOG.isDebugEnabled()) {
LOG.debug(this.mapper.writeValueAsString(doc));
}
- } catch (IOException | JSONException e) {
+ } catch (IOException e) {
LOG.error("Exception occured in ModelGenerator", e);
}
return null;
}
- private void addRootPostLink(final Module module, final DataNodeContainer node, final List<Parameter> pathParams,
- final String resourcePath, final String dataStore, final List<Api> apis) {
+ private static void addRootPostLink(final Module module, final DataNodeContainer node,
+ final
List<Parameter> pathParams, final String resourcePath, final String dataStore, final List<Api> apis) {
if (containsListOrContainer(module.getChildNodes())) {
final Api apiForRootPostUri = new Api();
apiForRootPostUri.setPath(resourcePath.concat(getContent(dataStore)));
apiForRootPostUri.setOperations(operationPost(module.getName() + MODULE_NAME_SUFFIX,
- module.getDescription(), module, pathParams, true, ""));
+ module.getDescription().orElse(null), module, pathParams, true, ""));
apis.add(apiForRootPostUri);
}
}
if (newDraft) {
if ("config".contains(dataStore) || "operational".contains(dataStore)) {
return "/" + RESTCONF_DRAFT + "/data" + context;
- } else {
- return "/" + RESTCONF_DRAFT + "/operations" + context;
}
- } else {
- return "/" + dataStore + context;
+ return "/" + RESTCONF_DRAFT + "/operations" + context;
}
+
+ return "/" + dataStore + context;
}
- private String generateCacheKey(final String module, final String revision) {
+ private static String generateCacheKey(final String module, final String revision) {
return module + "(" + revision + ")";
}
LOG.debug("Adding path: [{}]", resourcePath);
api.setPath(resourcePath.concat(getContent(dataStore)));
- Iterable<DataSchemaNode> childSchemaNodes = Collections.<DataSchemaNode> emptySet();
- if ((node instanceof ListSchemaNode) || (node instanceof ContainerSchemaNode)) {
+ Iterable<DataSchemaNode> childSchemaNodes = Collections.<DataSchemaNode>emptySet();
+ if (node instanceof ListSchemaNode || node instanceof ContainerSchemaNode) {
final DataNodeContainer dataNodeContainer = (DataNodeContainer) node;
childSchemaNodes = dataNodeContainer.getChildNodes();
}
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();
}
}
- private boolean containsListOrContainer(final Iterable<DataSchemaNode> nodes) {
+ private static boolean containsListOrContainer(final Iterable<DataSchemaNode> 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> operation(final DataSchemaNode node, final List<Parameter> pathParams,
+ private
static List<Operation> operation(final DataSchemaNode node, final List<Parameter> pathParams,
final boolean isConfig, final Iterable<DataSchemaNode> childSchemaNodes, final String parentName) {
final List<Operation> operations = new ArrayList<>();
operations.add(getBuilder.pathParams(pathParams).build());
if (isConfig) {
- final Put putBuilder = new Put(node.getQName().getLocalName(), node.getDescription(), parentName);
+ final Put putBuilder = new Put(node.getQName().getLocalName(), node.getDescription().orElse(null),
+ parentName);
operations.add(putBuilder.pathParams(pathParams).build());
final Delete deleteBuilder = new Delete(node);
operations.add(deleteBuilder.pathParams(pathParams).build());
if (containsListOrContainer(childSchemaNodes)) {
- operations.addAll(operationPost(node.getQName().getLocalName(), node.getDescription(),
+ operations.addAll(operationPost(node.getQName().getLocalName(), node.getDescription().orElse(null),
(DataNodeContainer) node, pathParams, isConfig, parentName + "/"));
}
}
return operations;
}
- private List<Operation> operationPost(final String name, final String description,
+ private static List<Operation> operationPost(final String name, final String description,
final DataNodeContainer dataNodeContainer, final List<Parameter> pathParams, final boolean isConfig,
final String parentName) {
final List<Operation> operations = new ArrayList<>();
return operations;
}
- private String createPath(final DataSchemaNode schemaNode, final List<Parameter> pathParams,
+ private
static String createPath(final DataSchemaNode schemaNode, final List<Parameter> pathParams,
final SchemaContext schemaContext) {
final ArrayList<LeafSchemaNode> pathListParams = new ArrayList<>();
final StringBuilder path = new StringBuilder();
final String localName = resolvePathArgumentsName(schemaNode, schemaContext);
path.append(localName);
- if ((schemaNode instanceof ListSchemaNode)) {
+ if (schemaNode instanceof ListSchemaNode) {
final List<QName> listKeys = ((ListSchemaNode) schemaNode).getKeyDefinition();
StringBuilder keyBuilder = null;
if (newDraft) {
for (final QName listKey : listKeys) {
final DataSchemaNode dataChildByName = ((DataNodeContainer) schemaNode).getDataChildByName(listKey);
- pathListParams.add(((LeafSchemaNode) dataChildByName));
+ pathListParams.add((LeafSchemaNode) dataChildByName);
final String pathParamIdentifier;
if (newDraft) {
pathParamIdentifier = keyBuilder.append("{").append(listKey.getLocalName()).append("}").toString();
final Parameter pathParam = new Parameter();
pathParam.setName(listKey.getLocalName());
- pathParam.setDescription(dataChildByName.getDescription());
+ pathParam.setDescription(dataChildByName.getDescription().orElse(null));
pathParam.setType("string");
pathParam.setParamType("path");
final Operation operationSpec = new Operation();
operationSpec.setMethod("POST");
- operationSpec.setNotes(rpcDefn.getDescription());
+ operationSpec.setNotes(rpcDefn.getDescription().orElse(null));
operationSpec.setNickname(rpcDefn.getQName().getLocalName());
- if (rpcDefn.getOutput() != null) {
+ if (!rpcDefn.getOutput().getChildNodes().isEmpty()) {
operationSpec.setType("(" + rpcDefn.getQName().getLocalName() + ")output" + OperationBuilder.TOP);
}
- if (rpcDefn.getInput() != null) {
+ if (!rpcDefn.getInput().getChildNodes().isEmpty()) {
final Parameter payload = new Parameter();
payload.setParamType("body");
payload.setType("(" + rpcDefn.getQName().getLocalName() + ")input" + OperationBuilder.TOP);
final SortedSet<Module> sortedModules = new TreeSet<>((module1, module2) -> {
int result = module1.getName().compareTo(module2.getName());
if (result == 0) {
- final Date module1Revision = module1.getRevision() != null ? module1.getRevision() : new Date(0);
- final Date module2Revision = module2.getRevision() != null ? module2.getRevision() : new Date(0);
- result = module1Revision.compareTo(module2Revision);
+ result = Revision.compare(module1.getRevision(), module2.getRevision());
}
if (result == 0) {
result = module1.getNamespace().compareTo(module2.getNamespace());
}
public void setDraft(final boolean draft) {
- this.newDraft = draft;
+ BaseYangSwaggerGenerator.newDraft = draft;
}
}
Code Review / netconf.git / blobdiff