X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-rest-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Frest%2Fimpl%2FNormalizedNodeJsonBodyWriter.java;h=2cdded2813d446df1c878f276d42a75755db0d07;hb=f94de91bba1210fa852aaab0490743f9f3553e99;hp=589f9cd662bf7f9ea8d456fba38ba7925595d84e;hpb=7f44a5812395762479de68d339c3d017db6c0e9d;p=controller.git diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/NormalizedNodeJsonBodyWriter.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/NormalizedNodeJsonBodyWriter.java index 589f9cd662..2cdded2813 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/NormalizedNodeJsonBodyWriter.java +++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/NormalizedNodeJsonBodyWriter.java @@ -8,6 +8,7 @@ package org.opendaylight.controller.sal.rest.impl; import com.google.common.base.Charsets; +import com.google.common.base.Optional; import com.google.gson.stream.JsonWriter; import java.io.IOException; import java.io.OutputStream; @@ -19,27 +20,27 @@ import javax.ws.rs.Produces; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; import javax.ws.rs.ext.MessageBodyWriter; import javax.ws.rs.ext.Provider; import org.opendaylight.controller.sal.rest.api.Draft02; +import org.opendaylight.controller.sal.rest.api.RestconfNormalizedNodeWriter; import org.opendaylight.controller.sal.rest.api.RestconfService; import org.opendaylight.controller.sal.restconf.impl.InstanceIdentifierContext; import org.opendaylight.controller.sal.restconf.impl.NormalizedNodeContext; -import org.opendaylight.controller.sal.restconf.impl.RestconfDocumentedException; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter; -import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeWriter; import org.opendaylight.yangtools.yang.data.codec.gson.JSONCodecFactory; import org.opendaylight.yangtools.yang.data.codec.gson.JSONNormalizedNodeStreamWriter; import org.opendaylight.yangtools.yang.data.codec.gson.JsonWriterFactory; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; +import org.opendaylight.yangtools.yang.model.api.RpcDefinition; import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaPath; @Provider @@ -47,6 +48,8 @@ import org.opendaylight.yangtools.yang.model.api.SchemaPath; Draft02.MediaTypes.OPERATION + RestconfService.JSON, MediaType.APPLICATION_JSON }) public class NormalizedNodeJsonBodyWriter implements MessageBodyWriter { + private static final int DEFAULT_INDENT_SPACES_NUM = 2; + @Override public boolean isWriteable(final Class type, final Type genericType, final Annotation[] annotations, final MediaType mediaType) { return type.equals(NormalizedNodeContext.class); @@ -63,66 +66,96 @@ public class NormalizedNodeJsonBodyWriter implements MessageBodyWriter data = t.getData(); if (data == null) { - throw new RestconfDocumentedException(Response.Status.NOT_FOUND); + return; } - final InstanceIdentifierContext context = t.getInstanceIdentifierContext(); + @SuppressWarnings("unchecked") + final InstanceIdentifierContext context = (InstanceIdentifierContext) t.getInstanceIdentifierContext(); SchemaPath path = context.getSchemaNode().getPath(); - boolean isDataRoot = false; + final JsonWriter jsonWriter = createJsonWriter(entityStream, t.getWriterParameters().isPrettyPrint()); + jsonWriter.beginObject(); + writeNormalizedNode(jsonWriter,path,context,data, t.getWriterParameters().getDepth()); + jsonWriter.endObject(); + jsonWriter.flush(); + } + + private void writeNormalizedNode(JsonWriter jsonWriter, SchemaPath path, + InstanceIdentifierContext context, NormalizedNode data, Optional depth) throws + IOException { + final RestconfNormalizedNodeWriter nnWriter; if (SchemaPath.ROOT.equals(path)) { - isDataRoot = true; + /* + * Creates writer without initialNs and we write children of root data container + * which is not visible in restconf + */ + nnWriter = createNormalizedNodeWriter(context,path,jsonWriter, depth); + writeChildren(nnWriter,(ContainerNode) data); + } else if (context.getSchemaNode() instanceof RpcDefinition) { + /* + * RpcDefinition is not supported as initial codec in JSONStreamWriter, + * so we need to emit initial output declaratation.. + */ + path = ((RpcDefinition) context.getSchemaNode()).getOutput().getPath(); + nnWriter = createNormalizedNodeWriter(context,path,jsonWriter, depth); + jsonWriter.name("output"); + jsonWriter.beginObject(); + writeChildren(nnWriter, (ContainerNode) data); + jsonWriter.endObject(); } else { path = path.getParent(); - // FIXME: Add proper handling of reading root. - } - JsonWriter jsonWriter = createJsonWriter(entityStream); - NormalizedNodeWriter nnWriter = createNormalizedNodeWriter(context,path,jsonWriter); - - jsonWriter.beginObject(); - if(isDataRoot) { - writeDataRoot(nnWriter,(ContainerNode) data); - } else { if(data instanceof MapEntryNode) { data = ImmutableNodes.mapNodeBuilder(data.getNodeType()).withChild(((MapEntryNode) data)).build(); } + nnWriter = createNormalizedNodeWriter(context,path,jsonWriter, depth); nnWriter.write(data); } - nnWriter.flush(); - jsonWriter.endObject(); - jsonWriter.flush(); } - private NormalizedNodeWriter createNormalizedNodeWriter(InstanceIdentifierContext context, SchemaPath path, JsonWriter jsonWriter) { + private void writeChildren(final RestconfNormalizedNodeWriter nnWriter, final ContainerNode data) throws IOException { + for(final DataContainerChild child : data.getValue()) { + nnWriter.write(child); + } + } + + private RestconfNormalizedNodeWriter createNormalizedNodeWriter(final InstanceIdentifierContext context, + final SchemaPath path, final JsonWriter jsonWriter, Optional depth) { - final DataSchemaNode schema = context.getSchemaNode(); + final SchemaNode schema = context.getSchemaNode(); final JSONCodecFactory codecs = getCodecFactory(context); - URI initialNs = null; - if(!schema.isAugmenting() && !(schema instanceof SchemaContext)) { + final URI initialNs; + if ((schema instanceof DataSchemaNode) + && !((DataSchemaNode)schema).isAugmenting() + && !(schema instanceof SchemaContext)) { + initialNs = schema.getQName().getNamespace(); + } else if (schema instanceof RpcDefinition) { initialNs = schema.getQName().getNamespace(); + } else { + initialNs = null; } final NormalizedNodeStreamWriter streamWriter = JSONNormalizedNodeStreamWriter.createNestedWriter(codecs,path,initialNs,jsonWriter); - return NormalizedNodeWriter.forStreamWriter(streamWriter); + if (depth.isPresent()) { + return DepthAwareNormalizedNodeWriter.forStreamWriter(streamWriter, depth.get()); + } else { + return RestconfDelegatingNormalizedNodeWriter.forStreamWriter(streamWriter); + } } - private JsonWriter createJsonWriter(OutputStream entityStream) { - // FIXME BUG-2153: Add pretty print support - return JsonWriterFactory.createJsonWriter(new OutputStreamWriter(entityStream, Charsets.UTF_8)); - + private JsonWriter createJsonWriter(final OutputStream entityStream, boolean prettyPrint) { + if (prettyPrint) { + return JsonWriterFactory.createJsonWriter(new OutputStreamWriter(entityStream, Charsets.UTF_8), + DEFAULT_INDENT_SPACES_NUM); + } else { + return JsonWriterFactory.createJsonWriter(new OutputStreamWriter(entityStream, Charsets.UTF_8)); + } } - private JSONCodecFactory getCodecFactory(InstanceIdentifierContext context) { + private JSONCodecFactory getCodecFactory(final InstanceIdentifierContext context) { // TODO: Performance: Cache JSON Codec factory and schema context return JSONCodecFactory.create(context.getSchemaContext()); } - private void writeDataRoot(final NormalizedNodeWriter nnWriter, final ContainerNode data) throws IOException { - for(DataContainerChild child : data.getValue()) { - nnWriter.write(child); - } - } - }