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=385d4009e0fcde6827c287cc978c6b2551f02ff7;hp=5d93f4ee4d162b22a35c610d4f79b35e7cf66fb6;hb=f5742910345f48f6e8502bf5a5a673ee3c63d155;hpb=4eb724db3877173d502ba38c6d83bec780b38bb2 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 5d93f4ee4d..385d4009e0 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 @@ -7,10 +7,9 @@ */ package org.opendaylight.controller.sal.dom.broker; -import java.util.List; +import com.google.common.collect.Iterables; +import com.google.common.util.concurrent.ListenableFuture; 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; import org.opendaylight.controller.md.sal.common.api.data.DataCommitHandlerRegistration; @@ -30,30 +29,30 @@ import org.opendaylight.controller.sal.core.api.mount.MountProvisionInstance; import org.opendaylight.controller.sal.core.api.notify.NotificationListener; import org.opendaylight.controller.sal.dom.broker.impl.NotificationRouterImpl; import org.opendaylight.controller.sal.dom.broker.impl.SchemaAwareRpcBroker; -import org.opendaylight.controller.sal.dom.broker.impl.SchemaContextProvider; import org.opendaylight.controller.sal.dom.broker.spi.NotificationRouter; import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.concepts.Registration; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.data.api.CompositeNode; -import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier; -import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.PathArgument; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.SchemaContextProvider; +@Deprecated 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 final DataReader readWrapper; + + + private final YangInstanceIdentifier mountPath; private SchemaContext schemaContext; - public MountPointImpl(InstanceIdentifier path) { + public MountPointImpl(final YangInstanceIdentifier path) { this.mountPath = path; rpcs = new SchemaAwareRpcBroker(path.toString(),this); dataReader = new DataBrokerImpl(); @@ -61,77 +60,80 @@ public class MountPointImpl implements MountProvisionInstance, SchemaContextProv readWrapper = new ReadWrapper(); } - public InstanceIdentifier getMountPath() { + public YangInstanceIdentifier getMountPath() { return mountPath; } - public DataReader getReadWrapper() { + public DataReader getReadWrapper() { return readWrapper; } @Override - public void publish(CompositeNode notification) { + public void publish(final CompositeNode notification) { notificationRouter.publish(notification); } @Override - public Registration addNotificationListener(QName notification, NotificationListener listener) { + public ListenerRegistration addNotificationListener(final QName notification, final NotificationListener listener) { return notificationRouter.addNotificationListener(notification, listener); } @Override - public CompositeNode readConfigurationData(InstanceIdentifier path) { + public CompositeNode readConfigurationData(final YangInstanceIdentifier path) { return dataReader.readConfigurationData(path); } @Override - public CompositeNode readOperationalData(InstanceIdentifier path) { + public CompositeNode readOperationalData(final YangInstanceIdentifier path) { return dataReader.readOperationalData(path); } - public Registration> registerOperationalReader( - InstanceIdentifier path, DataReader reader) { + @Override + public Registration registerOperationalReader( + final YangInstanceIdentifier path, final DataReader reader) { return dataReader.registerOperationalReader(path, reader); } - public Registration> registerConfigurationReader( - InstanceIdentifier path, DataReader reader) { + @Override + public Registration registerConfigurationReader( + final YangInstanceIdentifier 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 void setRoutedRpcDefaultDelegate(RoutedRpcDefaultImplementation defaultImplementation) { - rpcs.setRoutedRpcDefaultDelegate(defaultImplementation); + public void setRoutedRpcDefaultDelegate(final RoutedRpcDefaultImplementation defaultImplementation) { + rpcs.setRoutedRpcDefaultDelegate(defaultImplementation); } - @Override - public RpcRegistration addRpcImplementation(QName rpcType, RpcImplementation implementation) + @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 @@ -140,73 +142,67 @@ public class MountPointImpl implements MountProvisionInstance, SchemaContextProv } @Override - public ListenerRegistration registerDataChangeListener(InstanceIdentifier path, - DataChangeListener listener) { + public ListenerRegistration registerDataChangeListener(final YangInstanceIdentifier 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) { + public Registration registerCommitHandler( + final YangInstanceIdentifier 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) { - InstanceIdentifier ret = null; - if(mountPath.contains(path)) { - List newArgs = path.getPath().subList(mountPath.getPath().size(), path.getPath().size()); - ret = new InstanceIdentifier(newArgs); + class ReadWrapper implements DataReader { + private YangInstanceIdentifier shortenPath(final YangInstanceIdentifier path) { + if (!mountPath.contains(path)) { + return null; } - return ret; + + return YangInstanceIdentifier.create(Iterables.skip(path.getPathArguments(), Iterables.size(mountPath.getPathArguments()))); } - + @Override - public CompositeNode readConfigurationData(InstanceIdentifier path) { - InstanceIdentifier newPath = shortenPath(path); + public CompositeNode readConfigurationData(final YangInstanceIdentifier path) { + YangInstanceIdentifier newPath = shortenPath(path); if(newPath == null) { return null; } return MountPointImpl.this.readConfigurationData(newPath); } - + @Override - public CompositeNode readOperationalData(InstanceIdentifier path) { - InstanceIdentifier newPath = shortenPath(path); + public CompositeNode readOperationalData(final YangInstanceIdentifier path) { + YangInstanceIdentifier newPath = shortenPath(path); if(newPath == null) { return null; } @@ -215,16 +211,14 @@ public class MountPointImpl implements MountProvisionInstance, SchemaContextProv } @Override - public ListenerRegistration>> registerCommitHandlerListener( - RegistrationListener> commitHandlerListener) { + public ListenerRegistration>> registerCommitHandlerListener( + final RegistrationListener> commitHandlerListener) { return dataReader.registerCommitHandlerListener(commitHandlerListener); } @Override - public > ListenerRegistration registerRouteChangeListener( - L listener) { + public > ListenerRegistration registerRouteChangeListener( + final L listener) { return rpcs.registerRouteChangeListener(listener); } - - }