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%2Frestconf%2Fimpl%2FRestconfImpl.xtend;h=31fbe8ec876876b0d677ffaa90df95fddbdfa91a;hb=f8e25f0e3d6196b5d3625c94a52ed5a6ab3fe5a7;hp=4a23c76387db1c11e4ca78370eaf47a0795d629a;hpb=ce23509536c00cb2649c36b4b64ac261946445a1;p=controller.git

diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/RestconfImpl.xtend b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/RestconfImpl.xtend
index 4a23c76387..31fbe8ec87 100644
--- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/RestconfImpl.xtend
+++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/RestconfImpl.xtend
@@ -1,41 +1,92 @@
 package org.opendaylight.controller.sal.restconf.impl
 
 import org.opendaylight.yangtools.yang.data.api.CompositeNode
+import org.opendaylight.controller.sal.rest.api.RestconfService
 
 class RestconfImpl implements RestconfService {
     
+    val static RestconfImpl INSTANCE = new RestconfImpl
+
+    @Property
+    BrokerFacade broker
+
     @Property
-    BrokerFacade broker;
+    extension ControllerContext controllerContext
     
-    override readAllData() {
-        return broker.readOperationalData("");
+    private new() {
+        if (INSTANCE != null) {
+            throw new IllegalStateException("Already instantiated");
+        }
     }
     
-    
+    static def getInstance() {
+        return INSTANCE
+    }
+
+    override readAllData() {
+//        return broker.readOperationalData("".toInstanceIdentifier.getInstanceIdentifier);
+        throw new UnsupportedOperationException("Reading all data is currently not supported.")
+    }
+
     override getModules() {
         throw new UnsupportedOperationException("TODO: auto-generated method stub")
     }
-    
+
     override getRoot() {
-        throw new UnsupportedOperationException("TODO: auto-generated method stub")
-        
+        return null;
     }
-    
+
     override readData(String identifier) {
-        return broker.readOperationalData(identifier);
+        val instanceIdentifierWithSchemaNode = identifier.toInstanceIdentifier
+        val data = broker.readOperationalData(instanceIdentifierWithSchemaNode.getInstanceIdentifier);
+        return new StructuredData(data, instanceIdentifierWithSchemaNode.schemaNode)
     }
-    
+
     override createConfigurationData(String identifier, CompositeNode payload) {
-        return broker.commitConfigurationDataCreate(identifier,payload);
+        val identifierWithSchemaNode = identifier.toInstanceIdentifier
+        return broker.commitConfigurationDataPut(identifierWithSchemaNode.instanceIdentifier,payload).get();
+    }
+
+    override updateConfigurationData(String identifier, CompositeNode payload) {
+        val identifierWithSchemaNode = identifier.toInstanceIdentifier
+        return broker.commitConfigurationDataPut(identifierWithSchemaNode.instanceIdentifier,payload).get();
+    }
+
+    override invokeRpc(String identifier, CompositeNode payload) {
+        val rpc = identifier.toQName;
+        val rpcResult = broker.invokeRpc(rpc, payload);
+        val schema = controllerContext.getRpcOutputSchema(rpc);
+        return new StructuredData(rpcResult.result, schema);
+    }
+    
+    override readConfigurationData(String identifier) {
+        val instanceIdentifierWithSchemaNode = identifier.toInstanceIdentifier
+        val data = broker.readOperationalData(instanceIdentifierWithSchemaNode.getInstanceIdentifier);
+        return new StructuredData(data, instanceIdentifierWithSchemaNode.schemaNode)
     }
     
+    override readOperationalData(String identifier) {
+        val instanceIdentifierWithSchemaNode = identifier.toInstanceIdentifier
+        val data = broker.readOperationalData(instanceIdentifierWithSchemaNode.getInstanceIdentifier);
+        return new StructuredData(data, instanceIdentifierWithSchemaNode.schemaNode)
+    }
     
-    override updateConfigurationData(String identifier, CompositeNode payload) {
-        return broker.commitConfigurationDataCreate(identifier,payload);
+    override updateConfigurationDataLegacy(String identifier, CompositeNode payload) {
+        updateConfigurationData(identifier,payload);
     }
     
-    override invokeRpc(String identifier, CompositeNode payload) {
-        return broker.invokeRpc(identifier,payload);
+    override createConfigurationDataLegacy(String identifier, CompositeNode payload) {
+        createConfigurationData(identifier,payload);
     }
     
-}
\ No newline at end of file
+    override createOperationalData(String identifier, CompositeNode payload) {
+        val identifierWithSchemaNode = identifier.toInstanceIdentifier
+        return broker.commitOperationalDataPut(identifierWithSchemaNode.instanceIdentifier,payload).get();
+    }
+    
+    override updateOperationalData(String identifier, CompositeNode payload) {
+        val identifierWithSchemaNode = identifier.toInstanceIdentifier
+        return broker.commitOperationalDataPut(identifierWithSchemaNode.instanceIdentifier,payload).get();
+    }
+
+}