X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-dom-broker%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fdom%2Fbroker%2FMountPointImpl.java;h=e69343d4fe82c7f36a7a9c378c8669e67cb1114b;hp=5a3e060a3c9a52a2c55b4876b283ec5559de63e5;hb=92f1fd15e99ce5b9e52612c0b52f70cd661b99cc;hpb=99f9aa0ea003f3a8cc28dfef73b1b38a13e19039 diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/MountPointImpl.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/MountPointImpl.java index 5a3e060a3c..e69343d4fe 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/MountPointImpl.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/MountPointImpl.java @@ -9,7 +9,6 @@ package org.opendaylight.controller.sal.dom.broker; import java.util.List; import java.util.Set; -import java.util.concurrent.Future; import org.opendaylight.controller.md.sal.common.api.RegistrationListener; import org.opendaylight.controller.md.sal.common.api.data.DataCommitHandler; @@ -19,6 +18,7 @@ import org.opendaylight.controller.md.sal.common.api.routing.RouteChangeListener import org.opendaylight.controller.sal.common.DataStoreIdentifier; import org.opendaylight.controller.sal.core.api.Broker.RoutedRpcRegistration; import org.opendaylight.controller.sal.core.api.Broker.RpcRegistration; +import org.opendaylight.controller.sal.core.api.RoutedRpcDefaultImplementation; import org.opendaylight.controller.sal.core.api.RpcImplementation; import org.opendaylight.controller.sal.core.api.RpcRegistrationListener; import org.opendaylight.controller.sal.core.api.RpcRoutingContext; @@ -40,19 +40,21 @@ import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import com.google.common.util.concurrent.ListenableFuture; + public class MountPointImpl implements MountProvisionInstance, SchemaContextProvider { private final SchemaAwareRpcBroker rpcs; private final DataBrokerImpl dataReader; private final NotificationRouter notificationRouter; private final DataReader readWrapper; - - + + private final InstanceIdentifier mountPath; private SchemaContext schemaContext; - public MountPointImpl(InstanceIdentifier path) { + public MountPointImpl(final InstanceIdentifier path) { this.mountPath = path; rpcs = new SchemaAwareRpcBroker(path.toString(),this); dataReader = new DataBrokerImpl(); @@ -69,63 +71,71 @@ public class MountPointImpl implements MountProvisionInstance, SchemaContextProv } @Override - public void publish(CompositeNode notification) { + public void publish(final CompositeNode notification) { notificationRouter.publish(notification); } @Override - public Registration addNotificationListener(QName notification, NotificationListener listener) { + public Registration addNotificationListener(final QName notification, final NotificationListener listener) { return notificationRouter.addNotificationListener(notification, listener); } @Override - public CompositeNode readConfigurationData(InstanceIdentifier path) { + public CompositeNode readConfigurationData(final InstanceIdentifier path) { return dataReader.readConfigurationData(path); } @Override - public CompositeNode readOperationalData(InstanceIdentifier path) { + public CompositeNode readOperationalData(final InstanceIdentifier path) { return dataReader.readOperationalData(path); } + @Override public Registration> registerOperationalReader( - InstanceIdentifier path, DataReader reader) { + final InstanceIdentifier path, final DataReader reader) { return dataReader.registerOperationalReader(path, reader); } + @Override public Registration> registerConfigurationReader( - InstanceIdentifier path, DataReader reader) { + final InstanceIdentifier path, final DataReader reader) { return dataReader.registerConfigurationReader(path, reader); } @Override - public RoutedRpcRegistration addRoutedRpcImplementation(QName rpcType, RpcImplementation implementation) { + public RoutedRpcRegistration addRoutedRpcImplementation(final QName rpcType, final RpcImplementation implementation) { return rpcs.addRoutedRpcImplementation(rpcType, implementation); } @Override - public RpcRegistration addRpcImplementation(QName rpcType, RpcImplementation implementation) + public void setRoutedRpcDefaultDelegate(final RoutedRpcDefaultImplementation defaultImplementation) { + rpcs.setRoutedRpcDefaultDelegate(defaultImplementation); + } + + @Override + public RpcRegistration addRpcImplementation(final QName rpcType, final RpcImplementation implementation) throws IllegalArgumentException { return rpcs.addRpcImplementation(rpcType, implementation); } + @Override public Set getSupportedRpcs() { return rpcs.getSupportedRpcs(); } - - public RpcResult invokeRpc(QName rpc, CompositeNode input) { + @Override + public ListenableFuture> invokeRpc(final QName rpc, final CompositeNode input) { return rpcs.invokeRpc(rpc, input); } - public ListenerRegistration addRpcRegistrationListener(RpcRegistrationListener listener) { + @Override + public ListenerRegistration addRpcRegistrationListener(final RpcRegistrationListener listener) { return rpcs.addRpcRegistrationListener(listener); } - @Override - public Future> rpc(QName type, CompositeNode input) { - return null; + public ListenableFuture> rpc(final QName type, final CompositeNode input) { + return rpcs.invokeRpc( type, input ); } @Override @@ -134,72 +144,67 @@ public class MountPointImpl implements MountProvisionInstance, SchemaContextProv } @Override - public ListenerRegistration registerDataChangeListener(InstanceIdentifier path, - DataChangeListener listener) { + public ListenerRegistration registerDataChangeListener(final InstanceIdentifier path, + final DataChangeListener listener) { return dataReader.registerDataChangeListener(path, listener); } - @Override - public void sendNotification(CompositeNode notification) { - publish(notification); - } - @Override public Registration> registerCommitHandler( - InstanceIdentifier path, DataCommitHandler commitHandler) { + final InstanceIdentifier path, final DataCommitHandler commitHandler) { return dataReader.registerCommitHandler(path, commitHandler); } - + @Override - public void removeRefresher(DataStoreIdentifier store, DataRefresher refresher) { - // NOOP + public void removeRefresher(final DataStoreIdentifier store, final DataRefresher refresher) { + // NOOP } - + @Override - public void addRefresher(DataStoreIdentifier store, DataRefresher refresher) { - // NOOP + public void addRefresher(final DataStoreIdentifier store, final DataRefresher refresher) { + // NOOP } - + @Override - public void addValidator(DataStoreIdentifier store, DataValidator validator) { - // NOOP + public void addValidator(final DataStoreIdentifier store, final DataValidator validator) { + // NOOP } @Override - public void removeValidator(DataStoreIdentifier store, DataValidator validator) { + public void removeValidator(final DataStoreIdentifier store, final DataValidator validator) { // NOOP } - + + @Override public SchemaContext getSchemaContext() { return schemaContext; } - public void setSchemaContext(SchemaContext schemaContext) { + @Override + public void setSchemaContext(final SchemaContext schemaContext) { this.schemaContext = schemaContext; } class ReadWrapper implements DataReader { - - - private InstanceIdentifier shortenPath(InstanceIdentifier path) { + private InstanceIdentifier shortenPath(final InstanceIdentifier path) { InstanceIdentifier ret = null; if(mountPath.contains(path)) { List newArgs = path.getPath().subList(mountPath.getPath().size(), path.getPath().size()); - ret = new InstanceIdentifier(newArgs); + ret = InstanceIdentifier.create(newArgs); } return ret; } - + @Override - public CompositeNode readConfigurationData(InstanceIdentifier path) { + public CompositeNode readConfigurationData(final InstanceIdentifier path) { InstanceIdentifier newPath = shortenPath(path); if(newPath == null) { return null; } return MountPointImpl.this.readConfigurationData(newPath); } - + @Override - public CompositeNode readOperationalData(InstanceIdentifier path) { + public CompositeNode readOperationalData(final InstanceIdentifier path) { InstanceIdentifier newPath = shortenPath(path); if(newPath == null) { return null; @@ -210,13 +215,13 @@ public class MountPointImpl implements MountProvisionInstance, SchemaContextProv @Override public ListenerRegistration>> registerCommitHandlerListener( - RegistrationListener> commitHandlerListener) { + final RegistrationListener> commitHandlerListener) { return dataReader.registerCommitHandlerListener(commitHandlerListener); } @Override public > ListenerRegistration registerRouteChangeListener( - L listener) { + final L listener) { return rpcs.registerRouteChangeListener(listener); } }