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=263f0500fd1c280b470171352716c70b723c18c7;hp=ab5b145064c828cfa083f74a21beff4e66e9074a;hb=9c9d6e69da3aff2d0576d8c15ea0fa0692595b6d;hpb=0e5098806d9392b7683d46397384357324b4c6f0 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 ab5b145064..263f0500fd 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 @@ -1,54 +1,63 @@ +/* + * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ 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; import org.opendaylight.controller.md.sal.common.api.data.DataCommitHandlerRegistration; import org.opendaylight.controller.md.sal.common.api.data.DataReader; +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.RpcImplementation; 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; import org.opendaylight.controller.sal.core.api.data.DataChangeListener; import org.opendaylight.controller.sal.core.api.data.DataModificationTransaction; import org.opendaylight.controller.sal.core.api.data.DataValidator; 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.DataReaderRouter; import org.opendaylight.controller.sal.dom.broker.impl.NotificationRouterImpl; -import org.opendaylight.controller.sal.dom.broker.impl.RpcRouterImpl; +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.controller.sal.dom.broker.spi.RpcRouter; 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.InstanceIdentifierBuilder; import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -public class MountPointImpl implements MountProvisionInstance { +import com.google.common.util.concurrent.ListenableFuture; - private final RpcRouter rpcs; - private final DataReaderRouter dataReader; +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) { this.mountPath = path; - rpcs = new RpcRouterImpl(""); - dataReader = new DataReaderRouter(); + rpcs = new SchemaAwareRpcBroker(path.toString(),this); + dataReader = new DataBrokerImpl(); notificationRouter = new NotificationRouterImpl(); readWrapper = new ReadWrapper(); } @@ -81,11 +90,13 @@ public class MountPointImpl implements MountProvisionInstance { return dataReader.readOperationalData(path); } + @Override public Registration> registerOperationalReader( InstanceIdentifier path, DataReader reader) { return dataReader.registerOperationalReader(path, reader); } + @Override public Registration> registerConfigurationReader( InstanceIdentifier path, DataReader reader) { return dataReader.registerConfigurationReader(path, reader); @@ -97,66 +108,63 @@ public class MountPointImpl implements MountProvisionInstance { } @Override + public void setRoutedRpcDefaultDelegate(RoutedRpcDefaultImplementation defaultImplementation) { + rpcs.setRoutedRpcDefaultDelegate(defaultImplementation); + } + + @Override public RpcRegistration addRpcImplementation(QName rpcType, 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(QName rpc, CompositeNode input) { return rpcs.invokeRpc(rpc, input); } + @Override public ListenerRegistration addRpcRegistrationListener(RpcRegistrationListener listener) { return rpcs.addRpcRegistrationListener(listener); } - @Override - public Future> rpc(QName type, CompositeNode input) { - // TODO Auto-generated method stub + public ListenableFuture> rpc(QName type, CompositeNode input) { return null; } @Override public DataModificationTransaction beginTransaction() { - // TODO Auto-generated method stub - return null; + return dataReader.beginTransaction(); } @Override public ListenerRegistration registerDataChangeListener(InstanceIdentifier path, DataChangeListener listener) { - // TODO Auto-generated method stub - return null; + return dataReader.registerDataChangeListener(path, listener); } - @Override - public void sendNotification(CompositeNode notification) { - publish(notification); - } - @Override public Registration> registerCommitHandler( InstanceIdentifier path, DataCommitHandler commitHandler) { - // TODO Auto-generated method stub - return null; + return dataReader.registerCommitHandler(path, commitHandler); } - + @Override public void removeRefresher(DataStoreIdentifier store, DataRefresher refresher) { // NOOP } - + @Override public void addRefresher(DataStoreIdentifier store, DataRefresher refresher) { // NOOP } - + @Override public void addValidator(DataStoreIdentifier store, DataValidator validator) { // NOOP @@ -165,18 +173,20 @@ public class MountPointImpl implements MountProvisionInstance { public void removeValidator(DataStoreIdentifier store, DataValidator validator) { // NOOP } - + + @Override public SchemaContext getSchemaContext() { return schemaContext; } + @Override public void setSchemaContext(SchemaContext schemaContext) { this.schemaContext = schemaContext; } class ReadWrapper implements DataReader { - - + + private InstanceIdentifier shortenPath(InstanceIdentifier path) { InstanceIdentifier ret = null; if(mountPath.contains(path)) { @@ -185,7 +195,7 @@ public class MountPointImpl implements MountProvisionInstance { } return ret; } - + @Override public CompositeNode readConfigurationData(InstanceIdentifier path) { InstanceIdentifier newPath = shortenPath(path); @@ -194,7 +204,7 @@ public class MountPointImpl implements MountProvisionInstance { } return MountPointImpl.this.readConfigurationData(newPath); } - + @Override public CompositeNode readOperationalData(InstanceIdentifier path) { InstanceIdentifier newPath = shortenPath(path); @@ -208,7 +218,12 @@ public class MountPointImpl implements MountProvisionInstance { @Override public ListenerRegistration>> registerCommitHandlerListener( RegistrationListener> commitHandlerListener) { - // TODO Auto-generated method stub - return null; + return dataReader.registerCommitHandlerListener(commitHandlerListener); + } + + @Override + public > ListenerRegistration registerRouteChangeListener( + L listener) { + return rpcs.registerRouteChangeListener(listener); } }