BUG-8752: apidoc explorer show/hide and list operations no longer works 04/59804/1
authorYrineu Rodrigues <yrineu.rodrigues@serro.com>
Fri, 30 Jun 2017 19:13:48 +0000 (16:13 -0300)
committerYrineu Rodrigues <yrineu.rodrigues@serro.com>
Fri, 30 Jun 2017 19:14:15 +0000 (16:14 -0300)
This patch fixes the APIdoc explorer after change from
org.json to jackson

Change-Id: I9168c5aa08b820df38ac9a2413abba08a567cccf
Signed-off-by: Yrineu Rodrigues <yrineu.rodrigues@serro.com>
restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/impl/ModelGenerator.java

index 5149200a091064f75b2f169527c3ee053c1edbd6..ca6cb577a2542be75448f56926640bcffec8ec16 100644 (file)
@@ -12,7 +12,6 @@ import static org.opendaylight.netconf.sal.rest.doc.util.RestDocgenUtil.resolveN
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.fasterxml.jackson.databind.node.NullNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.databind.node.TextNode;
 import com.mifmif.common.regex.Generex;
@@ -110,7 +109,8 @@ public class ModelGenerator {
     public ObjectNode convertToJsonSchema(final Module module,
                                           final SchemaContext schemaContext) throws IOException {
         final ObjectNode models = JsonNodeFactory.instance.objectNode();
-        models.put(UNIQUE_EMPTY_IDENTIFIER, NullNode.getInstance());
+        final ObjectNode emptyIdentifier = JsonNodeFactory.instance.objectNode();
+        models.put(UNIQUE_EMPTY_IDENTIFIER, emptyIdentifier);
         topLevelModule = module;
         processModules(module, models, schemaContext);
         processContainersAndLists(module, models, schemaContext);