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=4944d96b546933c49637fbb66b4b91ea8add05d1;hb=fdb31721b3b17060158556f3e36be5800be18a07;hp=589f9cd662bf7f9ea8d456fba38ba7925595d84e;hpb=6345946ab68108ac70de6f0c472b520802656abe;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..4944d96b54 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
@@ -19,14 +19,12 @@ 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.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;
@@ -39,7 +37,9 @@ import org.opendaylight.yangtools.yang.data.codec.gson.JSONNormalizedNodeStreamW
 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
@@ -63,22 +63,25 @@ public class NormalizedNodeJsonBodyWriter implements MessageBodyWriter<Normalize
                     throws IOException, WebApplicationException {
         NormalizedNode<?, ?> data = t.getData();
         if (data == null) {
-            throw new RestconfDocumentedException(Response.Status.NOT_FOUND);
+            return;
         }
 
-        final InstanceIdentifierContext context = t.getInstanceIdentifierContext();
+        final InstanceIdentifierContext<SchemaNode> context = (InstanceIdentifierContext<SchemaNode>) t.getInstanceIdentifierContext();
 
         SchemaPath path = context.getSchemaNode().getPath();
         boolean isDataRoot = false;
         if (SchemaPath.ROOT.equals(path)) {
             isDataRoot = true;
+        } else if (context.getSchemaNode() instanceof RpcDefinition) {
+            isDataRoot = true;
+            path = ((RpcDefinition) context.getSchemaNode()).getOutput().getPath();
         } else {
             path = path.getParent();
             // FIXME: Add proper handling of reading root.
         }
 
-        JsonWriter jsonWriter = createJsonWriter(entityStream);
-        NormalizedNodeWriter nnWriter = createNormalizedNodeWriter(context,path,jsonWriter);
+        final JsonWriter jsonWriter = createJsonWriter(entityStream);
+        final NormalizedNodeWriter nnWriter = createNormalizedNodeWriter(context,path,jsonWriter);
 
         jsonWriter.beginObject();
         if(isDataRoot) {
@@ -95,32 +98,33 @@ public class NormalizedNodeJsonBodyWriter implements MessageBodyWriter<Normalize
         jsonWriter.flush();
     }
 
-    private NormalizedNodeWriter createNormalizedNodeWriter(InstanceIdentifierContext context, SchemaPath path, JsonWriter jsonWriter) {
+    private NormalizedNodeWriter createNormalizedNodeWriter(final InstanceIdentifierContext<SchemaNode> context,
+            final SchemaPath path, final JsonWriter jsonWriter) {
 
-        final DataSchemaNode schema = context.getSchemaNode();
+        final SchemaNode schema = context.getSchemaNode();
         final JSONCodecFactory codecs = getCodecFactory(context);
 
         URI initialNs = null;
-        if(!schema.isAugmenting() && !(schema instanceof SchemaContext)) {
+        if ( ! (schema instanceof RpcDefinition) && (!((DataSchemaNode)schema).isAugmenting() && !(schema instanceof SchemaContext))) {
             initialNs = schema.getQName().getNamespace();
         }
         final NormalizedNodeStreamWriter streamWriter = JSONNormalizedNodeStreamWriter.createNestedWriter(codecs,path,initialNs,jsonWriter);
         return NormalizedNodeWriter.forStreamWriter(streamWriter);
     }
 
-    private JsonWriter createJsonWriter(OutputStream entityStream) {
+    private JsonWriter createJsonWriter(final OutputStream entityStream) {
         // FIXME BUG-2153: Add pretty print support
         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<? extends PathArgument, ?> child : data.getValue()) {
+        for(final DataContainerChild<? extends PathArgument, ?> child : data.getValue()) {
             nnWriter.write(child);
         }
     }