From c9e43c3fa7ecc66546afb7eda8a1b5d5b15f4120 Mon Sep 17 00:00:00 2001 From: Tony Tkacik Date: Fri, 21 Aug 2015 12:45:19 +0200 Subject: [PATCH] Cleaned up sal-dom-* packages and removed legacy interfaces - Removed deprecated interfaces from mdsal-common-api, some of this interfaces will be present in controller for backwards compatibility - Changed groupId to org.opendaylight.mdsal - Changed artifactId from sal-core to msdal-dom Change-Id: I222bee07e5fd13fe10d19f01ba4f9bdf102bf3e5 Signed-off-by: Tony Tkacik --- common/artifacts/pom.xml | 47 ++++++ common/mdsal-common-api/pom.xml | 15 +- .../data/AsyncConfigurationCommitCohort.java | 68 -------- .../AsyncConfigurationCommitCoordinator.java | 38 ----- .../data/AsyncConfigurationCommitHandler.java | 121 -------------- .../md/sal/common/api/data/DataChange.java | 86 ---------- .../sal/common/api/data/DataChangeEvent.java | 53 ------- .../common/api/data/DataChangeListener.java | 28 ---- .../common/api/data/DataChangePublisher.java | 22 --- .../common/api/data/DataCommitHandler.java | 125 --------------- .../data/DataCommitHandlerRegistration.java | 26 ---- .../sal/common/api/data/DataModification.java | 100 ------------ .../DataModificationTransactionFactory.java | 19 --- .../md/sal/common/api/data/DataProvider.java | 20 --- .../common/api/data/DataProvisionService.java | 28 ---- .../md/sal/common/api/data/DataReader.java | 34 ---- .../md/sal/common/api/data/DataStore.java | 30 ---- .../notify/NotificationPublishService.java | 71 --------- .../NotificationSubscriptionService.java | 16 -- .../api/routing/MutableRoutingTable.java | 18 --- .../md/sal/common/api/routing/Route.java | 17 -- .../sal/common/api/routing/RouteChange.java | 44 ------ .../api/routing/RouteChangeListener.java | 30 ---- .../api/routing/RouteChangePublisher.java | 21 --- .../api/routing/RoutedRegistration.java | 42 ----- .../md/sal/common/api/routing/Router.java | 17 -- .../sal/common/api/routing/RoutingTable.java | 23 --- common/parent/pom.xml | 9 +- .../md-sal => dom}/mdsal-artifacts/pom.xml | 0 .../mdsal-dom-api}/.gitignore | 0 .../sal-dom-api => dom/mdsal-dom-api}/pom.xml | 20 +-- .../api/ClusteredDOMDataChangeListener.java | 0 .../md/sal/dom/api/DOMDataBroker.java | 0 .../sal/dom/api/DOMDataBrokerExtension.java | 0 .../md/sal/dom/api/DOMDataChangeListener.java | 0 .../dom/api/DOMDataReadOnlyTransaction.java | 0 .../sal/dom/api/DOMDataReadTransaction.java | 0 .../dom/api/DOMDataReadWriteTransaction.java | 0 .../dom/api/DOMDataTreeChangeListener.java | 0 .../sal/dom/api/DOMDataTreeChangeService.java | 40 ++--- .../md/sal/dom/api/DOMDataTreeIdentifier.java | 0 .../api/DOMDataTreeInaccessibleException.java | 0 .../md/sal/dom/api/DOMDataTreeListener.java | 6 +- .../api/DOMDataTreeListeningException.java | 0 .../sal/dom/api/DOMDataTreeLoopException.java | 0 .../md/sal/dom/api/DOMDataTreeProducer.java | 56 ++++--- .../api/DOMDataTreeProducerBusyException.java | 0 .../dom/api/DOMDataTreeProducerException.java | 0 .../dom/api/DOMDataTreeProducerFactory.java | 2 +- .../md/sal/dom/api/DOMDataTreeService.java | 3 +- .../md/sal/dom/api/DOMDataTreeShard.java | 0 .../DOMDataTreeShardingConflictException.java | 0 .../dom/api/DOMDataTreeShardingService.java | 0 .../sal/dom/api/DOMDataWriteTransaction.java | 6 + .../controller/md/sal/dom/api/DOMEvent.java | 0 .../md/sal/dom/api/DOMExtensibleService.java | 9 +- .../md/sal/dom/api/DOMMountPoint.java | 0 .../md/sal/dom/api/DOMMountPointService.java | 0 .../md/sal/dom/api/DOMNotification.java | 0 .../sal/dom/api/DOMNotificationListener.java | 0 .../api/DOMNotificationPublishService.java | 85 +++++----- .../api/DOMNotificationRejectedException.java | 2 +- .../sal/dom/api/DOMNotificationService.java | 28 ++-- .../dom/api/DOMRpcAvailabilityListener.java | 0 .../md/sal/dom/api/DOMRpcException.java | 0 .../md/sal/dom/api/DOMRpcIdentifier.java | 0 .../md/sal/dom/api/DOMRpcImplementation.java | 0 ...pcImplementationNotAvailableException.java | 0 .../api/DOMRpcImplementationRegistration.java | 0 .../md/sal/dom/api/DOMRpcProviderService.java | 0 .../md/sal/dom/api/DOMRpcResult.java | 0 .../md/sal/dom/api/DOMRpcService.java | 15 +- .../controller/md/sal/dom/api/DOMService.java | 0 .../md/sal/dom/api/DOMServiceExtension.java | 0 .../md/sal/dom/api/DOMTransactionChain.java | 0 .../controller/sal/core/api/Broker.java | 11 -- .../sal/core/api/BrokerService.java | 0 .../controller/sal/core/api/Consumer.java | 20 --- .../controller/sal/core/api/Provider.java | 21 --- .../sal/core/api/model/SchemaService.java | 0 .../api/mount/MountProvisionListener.java | 0 .../controller/sal/core/api/package-info.java | 0 .../AbstractDOMDataTreeServiceTestSuite.java | 0 dom/mdsal-dom-broker/pom.xml | 105 +++++++++++++ .../broker/impl/AbstractDOMDataBroker.java | 0 ...tractDOMForwardedCompositeTransaction.java | 0 ...bstractDOMForwardedTransactionFactory.java | 95 +++++------ .../impl/AbstractDOMRpcRoutingTableEntry.java | 0 .../dom/broker/impl/CommitCompatibility.java | 36 +++++ .../broker/impl/CommitCoordinationTask.java | 0 .../DOMDataBrokerTransactionChainImpl.java | 0 .../impl/DOMForwardedReadOnlyTransaction.java | 0 .../DOMForwardedReadWriteTransaction.java | 0 .../impl/DOMForwardedWriteTransaction.java | 5 +- .../broker/impl/DOMNotificationRouter.java | 0 .../impl/DOMNotificationRouterEvent.java | 0 .../md/sal/dom/broker/impl/DOMRpcRouter.java | 0 .../dom/broker/impl/DOMRpcRoutingTable.java | 0 .../impl/GlobalDOMRpcRoutingTableEntry.java | 0 .../dom/broker/impl/PingPongDataBroker.java | 0 .../sal/dom/broker/impl/PingPongFuture.java | 0 .../dom/broker/impl/PingPongTransaction.java | 3 +- .../broker/impl/PingPongTransactionChain.java | 0 .../impl/RoutedDOMRpcRoutingTableEntry.java | 0 .../broker/impl/SerializedDOMDataBroker.java | 0 .../dom/broker/impl/ShardRegistration.java | 0 .../dom/broker/impl/ShardedDOMDataTree.java | 0 .../impl/ShardedDOMDataTreeProducer.java | 0 .../impl/ShardedDOMDataWriteTransaction.java | 11 +- .../dom/broker/impl/ShardingTableEntry.java | 0 ...ransactionCommitFailedExceptionMapper.java | 0 .../impl/UnknownDOMRpcRoutingTableEntry.java | 0 .../impl/mount/DOMMountPointServiceImpl.java | 0 .../controller/sal/dom/broker/BrokerImpl.java | 0 .../sal/dom/broker/ConsumerContextImpl.java | 0 ...GlobalBundleScanningSchemaServiceImpl.java | 0 .../sal/dom/broker/ProviderContextImpl.java | 0 .../broker/impl/SchemaContextProviders.java | 0 .../osgi/AbstractBrokerServiceProxy.java | 0 .../dom/broker/osgi/DOMDataBrokerProxy.java | 0 .../osgi/DOMMountPointServiceProxy.java | 0 .../sal/dom/broker/osgi/ProxyFactory.java | 0 .../broker/osgi/SchemaServiceActivator.java | 0 .../dom/broker/osgi/SchemaServiceProxy.java | 0 .../sal/dom/broker/package-info.java | 0 .../dom/broker/util/ProxySchemaContext.java | 0 .../sal/dom/broker/util/YangSchemaUtils.java | 0 .../BlockingTransactionChainListener.java | 0 .../broker/impl/DOMBrokerPerformanceTest.java | 0 .../md/sal/dom/broker/impl/DOMBrokerTest.java | 0 .../broker/impl/DOMDataTreeListenerTest.java | 0 .../broker/impl/DOMTransactionChainTest.java | 0 .../broker/impl/MountPointServiceTest.java | 0 .../md/sal/dom/store/impl/TestModel.java | 0 .../test/resources/odl-datastore-test.yang | 0 .../mdsal-dom-inmemory-datastore}/pom.xml | 95 ++--------- .../impl/ChainedTransactionCommitImpl.java | 0 .../impl/DOMImmutableDataChangeEvent.java | 0 .../impl/DOMStoreTransactionChainImpl.java | 0 .../impl/DataChangeListenerRegistration.java | 0 .../dom/store/impl/InMemoryDOMDataStore.java | 0 .../InMemoryDOMDataStoreConfigProperties.java | 0 .../impl/InMemoryDOMDataStoreFactory.java | 0 ...nMemoryDOMStoreThreePhaseCommitCohort.java | 0 .../InMemoryDOMStoreTreeChangePublisher.java | 0 .../impl/ResolveDataChangeEventsTask.java | 0 .../store/impl/ResolveDataChangeState.java | 0 .../DataChangeListenerRegistrationImpl.java | 0 .../sal/dom/store/impl/tree/ListenerNode.java | 0 .../sal/dom/store/impl/tree/ListenerTree.java | 0 .../dom/store/impl/tree/ListenerWalker.java | 0 ...ndaylight-inmemory-datastore-provider.yang | 0 .../impl/AbstractDataChangeListenerTest.java | 47 +++--- .../sal/dom/store/impl/DatastoreTestTask.java | 0 .../DefaultDataChangeListenerTestSuite.java | 0 .../dom/store/impl/InMemoryDataStoreTest.java | 0 .../dom/store/impl/RootScopeSubtreeTest.java | 0 .../impl/SchemaUpdateForTransactionTest.java | 48 +++--- .../store/impl/TestDCLExecutorService.java | 0 .../md/sal/dom/store/impl/TestModel.java | 0 .../store/impl/WildcardedScopeBaseTest.java | 15 +- .../store/impl/WildcardedScopeOneTest.java | 24 ++- .../impl/WildcardedScopeSubtreeTest.java | 22 ++- .../test/resources/odl-datastore-test.yang | 1 + dom/mdsal-dom-spi/pom.xml | 25 +++ .../broker/spi/mount/SimpleDOMMountPoint.java | 0 .../broker/spi/rpc/RpcRoutingStrategy.java | 0 ...DOMDataTreeChangeListenerRegistration.java | 0 ...tractDOMRpcImplementationRegistration.java | 0 .../spi/AbstractDOMRpcProviderService.java | 0 .../sal/dom/spi/AbstractRegistrationTree.java | 0 .../DOMNotificationSubscriptionListener.java | 0 ...ificationSubscriptionListenerRegistry.java | 0 .../md/sal/dom/spi/DefaultDOMRpcResult.java | 0 .../sal/dom/spi/ForwardingDOMDataBroker.java | 0 .../ForwardingDOMDataReadOnlyTransaction.java | 0 ...ForwardingDOMDataReadWriteTransaction.java | 0 .../ForwardingDOMDataWriteTransaction.java | 0 ...rwardingDOMNotificationPublishService.java | 0 .../spi/ForwardingDOMNotificationService.java | 0 .../spi/ForwardingDOMRpcImplementation.java | 0 .../spi/ForwardingDOMRpcProviderService.java | 0 .../sal/dom/spi/ForwardingDOMRpcResult.java | 0 .../sal/dom/spi/ForwardingDOMRpcService.java | 0 .../spi/ForwardingDOMTransactionChain.java | 0 .../md/sal/dom/spi/RegistrationTreeNode.java | 0 .../sal/dom/spi/RegistrationTreeSnapshot.java | 0 .../core/spi/ForwardingConsumerSession.java | 0 .../core/spi/ForwardingProviderSession.java | 0 .../spi/data/AbstractDOMStoreTransaction.java | 6 +- .../AbstractDOMStoreTreeChangePublisher.java | 0 ...bstractSnapshotBackedTransactionChain.java | 0 .../sal/core/spi/data/DOMStore.java | 18 +-- .../spi/data/DOMStoreReadTransaction.java | 0 .../data/DOMStoreReadWriteTransaction.java | 0 .../data/DOMStoreThreePhaseCommitCohort.java | 22 +-- .../core/spi/data/DOMStoreTransaction.java | 0 .../spi/data/DOMStoreTransactionChain.java | 0 .../spi/data/DOMStoreTransactionFactory.java | 0 .../spi/data/DOMStoreTreeChangePublisher.java | 0 .../spi/data/DOMStoreWriteTransaction.java | 31 ++-- ...wardingDOMStoreThreePhaseCommitCohort.java | 0 .../data/SnapshotBackedReadTransaction.java | 11 +- .../SnapshotBackedReadWriteTransaction.java | 0 .../spi/data/SnapshotBackedTransactions.java | 0 .../data/SnapshotBackedWriteTransaction.java | 14 +- .../sal/core/spi/data/package-info.java | 0 .../controller/sal/core/spi/package-info.java | 0 dom/pom.xml | 31 ++++ .../md-sal => dom}/sal-test-model/pom.xml | 0 .../test/model/util/ListsBindingUtils.java | 0 .../yang/opendaylight-mdsal-augment-test.yang | 0 .../yang/opendaylight-mdsal-list-test.yang | 0 .../opendaylight-of-migration-test-model.yang | 0 .../yang/opendaylight-sal-test-store.yang | 0 .../yang/opendaylight-test-notification.yang | 0 .../yang/opendaylight-test-routed-rpc.yang | 0 .../yang/opendaylight-test-rpc-service.yang | 0 .../sal/core/api/AbstractConsumer.java | 74 --------- .../sal/core/api/AbstractProvider.java | 73 --------- ...RpcImplementationUnavailableException.java | 26 ---- .../sal/core/api/RpcRoutingContext.java | 79 ---------- opendaylight/md-sal/sal-dom-broker/pom.xml | 147 ------------------ .../broker/impl/jmx/CommitStatsMXBean.java | 45 ------ .../impl/jmx/CommitStatsMXBeanImpl.java | 60 ------- .../impl/jmx/CommitStatsMXBeanImplTest.java | 38 ----- opendaylight/md-sal/sal-dom-spi/pom.xml | 57 ------- .../controller/sal/core/spi/BrokerModule.java | 27 ---- .../data/statistics/DOMStoreStatsTracker.java | 44 ------ ...InMemoryConfigDataStoreProviderModule.java | 37 ----- ...yConfigDataStoreProviderModuleFactory.java | 13 -- ...oryOperationalDataStoreProviderModule.java | 37 ----- ...ationalDataStoreProviderModuleFactory.java | 13 -- .../impl/jmx/InMemoryDataStoreStats.java | 54 ------- pom.xml | 1 + 235 files changed, 561 insertions(+), 2421 deletions(-) delete mode 100644 common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncConfigurationCommitCohort.java delete mode 100644 common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncConfigurationCommitCoordinator.java delete mode 100644 common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncConfigurationCommitHandler.java delete mode 100644 common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataChange.java delete mode 100644 common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataChangeEvent.java delete mode 100644 common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataChangeListener.java delete mode 100644 common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataChangePublisher.java delete mode 100644 common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataCommitHandler.java delete mode 100644 common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataCommitHandlerRegistration.java delete mode 100644 common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataModification.java delete mode 100644 common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataModificationTransactionFactory.java delete mode 100644 common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataProvider.java delete mode 100644 common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataProvisionService.java delete mode 100644 common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataReader.java delete mode 100644 common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataStore.java delete mode 100644 common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/notify/NotificationPublishService.java delete mode 100644 common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/notify/NotificationSubscriptionService.java delete mode 100644 common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/MutableRoutingTable.java delete mode 100644 common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/Route.java delete mode 100644 common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/RouteChange.java delete mode 100644 common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/RouteChangeListener.java delete mode 100644 common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/RouteChangePublisher.java delete mode 100644 common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/RoutedRegistration.java delete mode 100644 common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/Router.java delete mode 100644 common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/RoutingTable.java rename {opendaylight/md-sal => dom}/mdsal-artifacts/pom.xml (100%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/.gitignore (100%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/pom.xml (74%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/ClusteredDOMDataChangeListener.java (100%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataBroker.java (100%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataBrokerExtension.java (100%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataChangeListener.java (100%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataReadOnlyTransaction.java (100%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataReadTransaction.java (100%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataReadWriteTransaction.java (100%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeChangeListener.java (100%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeChangeService.java (56%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeIdentifier.java (100%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeInaccessibleException.java (100%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeListener.java (89%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeListeningException.java (100%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeLoopException.java (100%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeProducer.java (60%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeProducerBusyException.java (100%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeProducerException.java (100%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeProducerFactory.java (93%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeService.java (95%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeShard.java (100%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeShardingConflictException.java (100%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeShardingService.java (100%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataWriteTransaction.java (95%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMEvent.java (100%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMExtensibleService.java (82%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMMountPoint.java (100%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMMountPointService.java (100%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMNotification.java (100%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMNotificationListener.java (100%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMNotificationPublishService.java (57%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMNotificationRejectedException.java (99%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMNotificationService.java (69%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcAvailabilityListener.java (100%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcException.java (100%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcIdentifier.java (100%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcImplementation.java (100%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcImplementationNotAvailableException.java (100%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcImplementationRegistration.java (100%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcProviderService.java (100%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcResult.java (100%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcService.java (79%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMService.java (100%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMServiceExtension.java (100%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMTransactionChain.java (100%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/sal/core/api/Broker.java (91%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/sal/core/api/BrokerService.java (100%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/sal/core/api/Consumer.java (72%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/sal/core/api/Provider.java (73%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/sal/core/api/model/SchemaService.java (100%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/sal/core/api/mount/MountProvisionListener.java (100%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/main/java/org/opendaylight/controller/sal/core/api/package-info.java (100%) rename {opendaylight/md-sal/sal-dom-api => dom/mdsal-dom-api}/src/test/java/org/opendaylight/controller/md/sal/dom/api/AbstractDOMDataTreeServiceTestSuite.java (100%) create mode 100644 dom/mdsal-dom-broker/pom.xml rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/AbstractDOMDataBroker.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/AbstractDOMForwardedCompositeTransaction.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/AbstractDOMForwardedTransactionFactory.java (73%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/AbstractDOMRpcRoutingTableEntry.java (100%) create mode 100644 dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/CommitCompatibility.java rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/CommitCoordinationTask.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMDataBrokerTransactionChainImpl.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMForwardedReadOnlyTransaction.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMForwardedReadWriteTransaction.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMForwardedWriteTransaction.java (96%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMNotificationRouter.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMNotificationRouterEvent.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMRpcRouter.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMRpcRoutingTable.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/GlobalDOMRpcRoutingTableEntry.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongDataBroker.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongFuture.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongTransaction.java (94%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongTransactionChain.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/RoutedDOMRpcRoutingTableEntry.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/SerializedDOMDataBroker.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/ShardRegistration.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/ShardedDOMDataTree.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/ShardedDOMDataTreeProducer.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/ShardedDOMDataWriteTransaction.java (91%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/ShardingTableEntry.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/TransactionCommitFailedExceptionMapper.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/UnknownDOMRpcRoutingTableEntry.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/mount/DOMMountPointServiceImpl.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/main/java/org/opendaylight/controller/sal/dom/broker/BrokerImpl.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/main/java/org/opendaylight/controller/sal/dom/broker/ConsumerContextImpl.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/main/java/org/opendaylight/controller/sal/dom/broker/GlobalBundleScanningSchemaServiceImpl.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/main/java/org/opendaylight/controller/sal/dom/broker/ProviderContextImpl.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/SchemaContextProviders.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/AbstractBrokerServiceProxy.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/DOMDataBrokerProxy.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/DOMMountPointServiceProxy.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/ProxyFactory.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/SchemaServiceActivator.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/SchemaServiceProxy.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/main/java/org/opendaylight/controller/sal/dom/broker/package-info.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/main/java/org/opendaylight/controller/sal/dom/broker/util/ProxySchemaContext.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/main/java/org/opendaylight/controller/sal/dom/broker/util/YangSchemaUtils.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/BlockingTransactionChainListener.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMBrokerPerformanceTest.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMBrokerTest.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMDataTreeListenerTest.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMTransactionChainTest.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/MountPointServiceTest.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/TestModel.java (100%) rename {opendaylight/md-sal/sal-dom-broker => dom/mdsal-dom-broker}/src/test/resources/odl-datastore-test.yang (100%) rename {opendaylight/md-sal/sal-inmemory-datastore => dom/mdsal-dom-inmemory-datastore}/pom.xml (54%) rename {opendaylight/md-sal/sal-inmemory-datastore => dom/mdsal-dom-inmemory-datastore}/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/ChainedTransactionCommitImpl.java (100%) rename {opendaylight/md-sal/sal-inmemory-datastore => dom/mdsal-dom-inmemory-datastore}/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/DOMImmutableDataChangeEvent.java (100%) rename {opendaylight/md-sal/sal-inmemory-datastore => dom/mdsal-dom-inmemory-datastore}/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/DOMStoreTransactionChainImpl.java (100%) rename {opendaylight/md-sal/sal-inmemory-datastore => dom/mdsal-dom-inmemory-datastore}/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/DataChangeListenerRegistration.java (100%) rename {opendaylight/md-sal/sal-inmemory-datastore => dom/mdsal-dom-inmemory-datastore}/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMDataStore.java (100%) rename {opendaylight/md-sal/sal-inmemory-datastore => dom/mdsal-dom-inmemory-datastore}/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMDataStoreConfigProperties.java (100%) rename {opendaylight/md-sal/sal-inmemory-datastore => dom/mdsal-dom-inmemory-datastore}/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMDataStoreFactory.java (100%) rename {opendaylight/md-sal/sal-inmemory-datastore => dom/mdsal-dom-inmemory-datastore}/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMStoreThreePhaseCommitCohort.java (100%) rename {opendaylight/md-sal/sal-inmemory-datastore => dom/mdsal-dom-inmemory-datastore}/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMStoreTreeChangePublisher.java (100%) rename {opendaylight/md-sal/sal-inmemory-datastore => dom/mdsal-dom-inmemory-datastore}/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/ResolveDataChangeEventsTask.java (100%) rename {opendaylight/md-sal/sal-inmemory-datastore => dom/mdsal-dom-inmemory-datastore}/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/ResolveDataChangeState.java (100%) rename {opendaylight/md-sal/sal-inmemory-datastore => dom/mdsal-dom-inmemory-datastore}/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/tree/DataChangeListenerRegistrationImpl.java (100%) rename {opendaylight/md-sal/sal-inmemory-datastore => dom/mdsal-dom-inmemory-datastore}/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/tree/ListenerNode.java (100%) rename {opendaylight/md-sal/sal-inmemory-datastore => dom/mdsal-dom-inmemory-datastore}/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/tree/ListenerTree.java (100%) rename {opendaylight/md-sal/sal-inmemory-datastore => dom/mdsal-dom-inmemory-datastore}/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/tree/ListenerWalker.java (100%) rename {opendaylight/md-sal/sal-inmemory-datastore => dom/mdsal-dom-inmemory-datastore}/src/main/yang/opendaylight-inmemory-datastore-provider.yang (100%) rename {opendaylight/md-sal/sal-inmemory-datastore => dom/mdsal-dom-inmemory-datastore}/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/AbstractDataChangeListenerTest.java (74%) rename {opendaylight/md-sal/sal-inmemory-datastore => dom/mdsal-dom-inmemory-datastore}/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/DatastoreTestTask.java (100%) rename {opendaylight/md-sal/sal-inmemory-datastore => dom/mdsal-dom-inmemory-datastore}/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/DefaultDataChangeListenerTestSuite.java (100%) rename {opendaylight/md-sal/sal-inmemory-datastore => dom/mdsal-dom-inmemory-datastore}/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDataStoreTest.java (100%) rename {opendaylight/md-sal/sal-inmemory-datastore => dom/mdsal-dom-inmemory-datastore}/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/RootScopeSubtreeTest.java (100%) rename {opendaylight/md-sal/sal-inmemory-datastore => dom/mdsal-dom-inmemory-datastore}/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/SchemaUpdateForTransactionTest.java (61%) rename {opendaylight/md-sal/sal-inmemory-datastore => dom/mdsal-dom-inmemory-datastore}/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/TestDCLExecutorService.java (100%) rename {opendaylight/md-sal/sal-inmemory-datastore => dom/mdsal-dom-inmemory-datastore}/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/TestModel.java (100%) rename {opendaylight/md-sal/sal-inmemory-datastore => dom/mdsal-dom-inmemory-datastore}/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/WildcardedScopeBaseTest.java (88%) rename {opendaylight/md-sal/sal-inmemory-datastore => dom/mdsal-dom-inmemory-datastore}/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/WildcardedScopeOneTest.java (81%) rename {opendaylight/md-sal/sal-inmemory-datastore => dom/mdsal-dom-inmemory-datastore}/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/WildcardedScopeSubtreeTest.java (80%) rename {opendaylight/md-sal/sal-inmemory-datastore => dom/mdsal-dom-inmemory-datastore}/src/test/resources/odl-datastore-test.yang (96%) create mode 100644 dom/mdsal-dom-spi/pom.xml rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/md/sal/dom/broker/spi/mount/SimpleDOMMountPoint.java (100%) rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/md/sal/dom/broker/spi/rpc/RpcRoutingStrategy.java (100%) rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/md/sal/dom/spi/AbstractDOMDataTreeChangeListenerRegistration.java (100%) rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/md/sal/dom/spi/AbstractDOMRpcImplementationRegistration.java (100%) rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/md/sal/dom/spi/AbstractDOMRpcProviderService.java (100%) rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/md/sal/dom/spi/AbstractRegistrationTree.java (100%) rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/md/sal/dom/spi/DOMNotificationSubscriptionListener.java (100%) rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/md/sal/dom/spi/DOMNotificationSubscriptionListenerRegistry.java (100%) rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/md/sal/dom/spi/DefaultDOMRpcResult.java (100%) rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMDataBroker.java (100%) rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMDataReadOnlyTransaction.java (100%) rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMDataReadWriteTransaction.java (100%) rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMDataWriteTransaction.java (100%) rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMNotificationPublishService.java (100%) rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMNotificationService.java (100%) rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMRpcImplementation.java (100%) rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMRpcProviderService.java (100%) rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMRpcResult.java (100%) rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMRpcService.java (100%) rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMTransactionChain.java (100%) rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/md/sal/dom/spi/RegistrationTreeNode.java (100%) rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/md/sal/dom/spi/RegistrationTreeSnapshot.java (100%) rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/sal/core/spi/ForwardingConsumerSession.java (100%) rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/sal/core/spi/ForwardingProviderSession.java (100%) rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/sal/core/spi/data/AbstractDOMStoreTransaction.java (94%) rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/sal/core/spi/data/AbstractDOMStoreTreeChangePublisher.java (100%) rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/sal/core/spi/data/AbstractSnapshotBackedTransactionChain.java (100%) rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStore.java (81%) rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreReadTransaction.java (100%) rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreReadWriteTransaction.java (100%) rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreThreePhaseCommitCohort.java (76%) rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreTransaction.java (100%) rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreTransactionChain.java (100%) rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreTransactionFactory.java (100%) rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreTreeChangePublisher.java (100%) rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreWriteTransaction.java (65%) rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/sal/core/spi/data/ForwardingDOMStoreThreePhaseCommitCohort.java (100%) rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedReadTransaction.java (93%) rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedReadWriteTransaction.java (100%) rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedTransactions.java (100%) rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedWriteTransaction.java (95%) rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/sal/core/spi/data/package-info.java (100%) rename {opendaylight/md-sal/sal-dom-spi => dom/mdsal-dom-spi}/src/main/java/org/opendaylight/controller/sal/core/spi/package-info.java (100%) create mode 100644 dom/pom.xml rename {opendaylight/md-sal => dom}/sal-test-model/pom.xml (100%) rename {opendaylight/md-sal => dom}/sal-test-model/src/main/java/org/opendaylight/controller/md/sal/test/model/util/ListsBindingUtils.java (100%) rename {opendaylight/md-sal => dom}/sal-test-model/src/main/yang/opendaylight-mdsal-augment-test.yang (100%) rename {opendaylight/md-sal => dom}/sal-test-model/src/main/yang/opendaylight-mdsal-list-test.yang (100%) rename {opendaylight/md-sal => dom}/sal-test-model/src/main/yang/opendaylight-of-migration-test-model.yang (100%) rename {opendaylight/md-sal => dom}/sal-test-model/src/main/yang/opendaylight-sal-test-store.yang (100%) rename {opendaylight/md-sal => dom}/sal-test-model/src/main/yang/opendaylight-test-notification.yang (100%) rename {opendaylight/md-sal => dom}/sal-test-model/src/main/yang/opendaylight-test-routed-rpc.yang (100%) rename {opendaylight/md-sal => dom}/sal-test-model/src/main/yang/opendaylight-test-rpc-service.yang (100%) delete mode 100644 opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/AbstractConsumer.java delete mode 100644 opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/AbstractProvider.java delete mode 100644 opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/RpcImplementationUnavailableException.java delete mode 100644 opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/RpcRoutingContext.java delete mode 100644 opendaylight/md-sal/sal-dom-broker/pom.xml delete mode 100644 opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/jmx/CommitStatsMXBean.java delete mode 100644 opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/jmx/CommitStatsMXBeanImpl.java delete mode 100644 opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/jmx/CommitStatsMXBeanImplTest.java delete mode 100644 opendaylight/md-sal/sal-dom-spi/pom.xml delete mode 100644 opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/BrokerModule.java delete mode 100644 opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/statistics/DOMStoreStatsTracker.java delete mode 100644 opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/config/yang/inmemory_datastore_provider/InMemoryConfigDataStoreProviderModule.java delete mode 100644 opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/config/yang/inmemory_datastore_provider/InMemoryConfigDataStoreProviderModuleFactory.java delete mode 100644 opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/config/yang/inmemory_datastore_provider/InMemoryOperationalDataStoreProviderModule.java delete mode 100644 opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/config/yang/inmemory_datastore_provider/InMemoryOperationalDataStoreProviderModuleFactory.java delete mode 100644 opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/jmx/InMemoryDataStoreStats.java diff --git a/common/artifacts/pom.xml b/common/artifacts/pom.xml index 4c634f3f79..63dd4dffe9 100644 --- a/common/artifacts/pom.xml +++ b/common/artifacts/pom.xml @@ -17,6 +17,36 @@ + + + + ${project.groupId} + mdsal-common-api + ${project.version} + + + + ${project.groupId} + mdsal-dom-api + ${project.version} + + + ${project.groupId} + mdsal-dom-spi + ${project.version} + + + ${project.groupId} + mdsal-dom-broker + ${project.version} + + + ${project.groupId} + mdsal-dom-inmemory-datastore + ${project.version} + + + org.opendaylight.mdsal maven-sal-api-gen-plugin @@ -67,6 +97,23 @@ mdsal-binding-dom-codec 0.8.0-SNAPSHOT + + + ${project.groupId} + mdsal-binding-api + ${project.version} + + + ${project.groupId} + mdsal-binding-dom-adapter + ${project.version} + + + ${project.groupId} + mdsal-binding-util + ${project.version} + + org.opendaylight.mdsal mdsal-binding-test-model diff --git a/common/mdsal-common-api/pom.xml b/common/mdsal-common-api/pom.xml index fe44128079..cf8a2c15d5 100644 --- a/common/mdsal-common-api/pom.xml +++ b/common/mdsal-common-api/pom.xml @@ -2,12 +2,13 @@ 4.0.0 - org.opendaylight.controller - sal-parent - 1.3.0-SNAPSHOT + org.opendaylight.mdsal + mdsal-parent + 2.0.0-SNAPSHOT + ../parent - sal-common-api + mdsal-common-api bundle @@ -30,9 +31,9 @@ - scm:git:http://git.opendaylight.org/gerrit/controller.git - scm:git:ssh://git.opendaylight.org:29418/controller.git + scm:git:http://git.opendaylight.org/gerrit/mdsal.git + scm:git:ssh://git.opendaylight.org:29418/mdsal.git HEAD - https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL + https://wiki.opendaylight.org/view/MD-SAL:Main diff --git a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncConfigurationCommitCohort.java b/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncConfigurationCommitCohort.java deleted file mode 100644 index 9fb350b7c0..0000000000 --- a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncConfigurationCommitCohort.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (c) 2014 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.md.sal.common.api.data; - -import org.opendaylight.yangtools.concepts.Path; - -import com.google.common.util.concurrent.ListenableFuture; - -/** - * - * Three phase Commit Cohort for subtree, which is - * uniquely associated with user submitted transcation. - * - * @param

- * Type of path (subtree identifier), which represents location in - * tree - * @param - * Type of data (payload), which represents data payload - */ -public interface AsyncConfigurationCommitCohort

, D> { - - /** - * Initiates a pre-commit of associated request - * - * Implementation MUST NOT do any blocking calls during this callback, all - * pre-commit preparation SHOULD happen asynchronously and MUST result in - * completing returned future object. - * - * @param rebasedTransaction - * Read-only view of transaction as if happened on top of actual - * data store - * @return Future which is completed once pre-commit phase for this request - * is finished. - */ - ListenableFuture preCommit(AsyncReadTransaction rebasedTransaction); - - /** - * - * Initiates a commit phase of associated request - * - * Implementation MUST NOT do any blocking calls during this callback, all - * commit finalization SHOULD happen asynchronously and MUST result in - * completing returned future object. - * - * @return Future which is completed once commit phase for associated - * request is finished. - */ - ListenableFuture commit(); - - /** - * - * Initiates abort phase of associated request - * - * Implementation MUST NOT do any blocking calls during this callback, all - * commit finalization SHOULD happen asynchronously and MUST result in - * completing returned future object. - * - * @return Future which is completed once commit phase for associated - * request is finished. - */ - ListenableFuture abort(); - -} diff --git a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncConfigurationCommitCoordinator.java b/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncConfigurationCommitCoordinator.java deleted file mode 100644 index 6d669ab9df..0000000000 --- a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncConfigurationCommitCoordinator.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) 2014 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.md.sal.common.api.data; - -import org.opendaylight.yangtools.concepts.ObjectRegistration; -import org.opendaylight.yangtools.concepts.Path; - -/** - * Three Phase Commit Coordinator with support of user-supplied commit cohorts - * which participates in three-phase commit protocols - * - * @param

- * Type of path (subtree identifier), which represents location in - * tree - * @param - * Type of data (payload), which represents data payload - */ -public interface AsyncConfigurationCommitCoordinator

, D> { - - /** - * Register configuration commit handler for particular subtree - * - * Configuration commit handler is invoked for all write transactions - * which modifies subtree - * - * @param subtree Subtree which configuration commit handler is interested it - * @param commitHandler Instance of user-provided commit handler - * @return Registration object representing this registration. Invoking {@link ObjectRegistration#close()} - * will unregister configuration commit handler. - */ - > ObjectRegistration registerConfigurationCommitHandler( - P subtree, C commitHandler); -} diff --git a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncConfigurationCommitHandler.java b/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncConfigurationCommitHandler.java deleted file mode 100644 index 6025e139ab..0000000000 --- a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncConfigurationCommitHandler.java +++ /dev/null @@ -1,121 +0,0 @@ -/* - * Copyright (c) 2014 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.md.sal.common.api.data; - -import org.opendaylight.yangtools.concepts.Path; - -import com.google.common.util.concurrent.CheckedFuture; - -/** - * User-supplied participant in three-phase commit of transaction for configuration data tree - * - * Client-supplied implementation of commit handler for subtree, which - * is responsible for processing CAN-COMMIT phase of three-phase commit protocol - * and return CommitCohort, which provides access to additional transitions - * such as PRE-COMMIT, COMMIT and ABORT. - * - * @param

- * Type of path (subtree identifier), which represents location in - * tree - * @param - * Type of data (payload), which represents data payload - */ -public interface AsyncConfigurationCommitHandler

, D> { - - /** - * - * Requests a can commit phase - * - * Implementations SHOULD NOT do any blocking operation during - * processing this callback. - * - * Implementation Notes - *

    - *
  • Implementation are REQUIRED to use request object for any data related access
    • - *
  • Implementations SHOULD NOT use any other state stored outside configuration subtree for validation
    • - *
  • Validation should happen asynchronously, outside callback call by updating returned {@link CheckedFuture} - * object.
    • - *
  • If validation (CAN_COMMIT) phase: - *
      - *
    • is successful - invocation of {@link CheckedFuture#checkedGet()} on returned future MUST - * return {@link AsyncConfigurationCommitCohort} associated with request.
      • - *
    • is unsuccessful - invocation of {@link CheckedFuture#checkedGet()} must throw instance of {@link DataValidationFailedException} - * with human readable explanaition of error condition. - *
      • - *
    - *
    • - * @param request - * Commit Request submitted by client, which contains - * information about modifications and read-only view as - * if transaction happened. - * @return CheckedFuture which contains client-supplied implementation of {@link AsyncConfigurationCommitCohort} - * associated with submitted request, if can commit phase is - * successful, if can commit was unsuccessful, future must fail with - * {@link TransactionCommitFailedException} exception. - */ - CheckedFuture, DataValidationFailedException> canCommit( - ConfigurationCommitRequest request); - - /** - * - * Commit Request as was submitted by client code - * - * Commit Request contains list view of created / updated / removed - * path and read-only view of proposed client transaction, - * which may be used to retrieve modified or referenced data. - * - * - * @param

    - * Type of path (subtree identifier), which represents location - * in tree - * @param - * Type of data (payload), which represents data payload - */ - static interface ConfigurationCommitRequest

    , D> { - - /** - * - * Read-only transaction which provides access only to configuration - * data tree as if submitted transaction successfully happened and - * no other concurrent modifications happened between allocation - * of client transactions and write of client transactions. - * - * Implementations of Commit Handlers are REQUIRED to use this - * read-only view to access any data from configuration data tree, - * in order to capture them as preconditions for this transaction. - * - * @return Read-only transaction which provides access only to configuration - * data tree as if submitted transaction successfully happened - */ - AsyncReadTransaction getReadOnlyView(); - - /** - * - * Returns iteration of paths, to data which was introduced by this transaction. - * - * @return Iteration of paths, which was introduced by this transaction. - */ - Iterable

    getCreatedPaths(); - /** - * - * Returns iteration of paths, to data which was updated by this transaction. - * - * @return Iteration of paths, which was updated by this transaction. - */ - Iterable

    getUpdatedPaths(); - - /** - * - * Returns iteration of paths, to data which was removed by this transaction. - * - * @return Iteration of paths, which was removed by this transaction. - */ - Iterable

    getRemovedPaths(); - } - -} diff --git a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataChange.java b/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataChange.java deleted file mode 100644 index ebffbcc811..0000000000 --- a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataChange.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * 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.md.sal.common.api.data; - -import java.util.Map; -import java.util.Set; - -import org.opendaylight.yangtools.concepts.Path; - -public interface DataChange

    , D> { - - /** - * Returns a map of paths and newly created objects - * - * @return map of paths and newly created objects - */ - Map getCreatedOperationalData(); - - /** - * Returns a map of paths and newly created objects - * - * @return map of paths and newly created objects - */ - Map getCreatedConfigurationData(); - - /** - * Returns a map of paths and respective updated objects after update. - * - * Original state of the object is in - * {@link #getOriginalOperationalData()} - * - * @return map of paths and newly created objects - */ - Map getUpdatedOperationalData(); - - /** - * Returns a map of paths and respective updated objects after update. - * - * Original state of the object is in - * {@link #getOriginalConfigurationData()} - * - * @return map of paths and newly created objects - */ - Map getUpdatedConfigurationData(); - - - - /** - * Returns a set of paths of removed objects. - * - * Original state of the object is in - * {@link #getOriginalConfigurationData()} - * - * @return map of paths and newly created objects - */ - Set

    getRemovedConfigurationData(); - - /** - * Returns a set of paths of removed objects. - * - * Original state of the object is in - * {@link #getOriginalOperationalData()} - * - * @return map of paths and newly created objects - */ - Set

    getRemovedOperationalData(); - - /** - * Return a map of paths and original state of updated and removed objectd. - * - * @return map of paths and original state of updated and removed objectd. - */ - Map getOriginalConfigurationData(); - - /** - * Return a map of paths and original state of updated and removed objectd. - * - * @return map of paths and original state of updated and removed objectd. - */ - Map getOriginalOperationalData(); -} diff --git a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataChangeEvent.java b/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataChangeEvent.java deleted file mode 100644 index 5e5ea0c138..0000000000 --- a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataChangeEvent.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * 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.md.sal.common.api.data; - -import org.opendaylight.yangtools.concepts.Immutable; -import org.opendaylight.yangtools.concepts.Path; - -/** - * - * - * - * @param

    - * @param - * @deprecated Replaced by {@link AsyncDataChangeEvent} - */ -@Deprecated -public interface DataChangeEvent

    ,D> extends DataChange, Immutable { - - /** - * Returns a orignal subtree of data, which starts at the path - * where listener was registered. - * - */ - D getOriginalConfigurationSubtree(); - - /** - * Returns a new subtree of data, which starts at the path - * where listener was registered. - * - */ - D getOriginalOperationalSubtree(); - - - - /** - * Returns a updated subtree of data, which starts at the path - * where listener was registered. - * - */ - D getUpdatedConfigurationSubtree(); - - /** - * Returns a udpated subtree of data, which starts at the path - * where listener was registered. - * - */ - D getUpdatedOperationalSubtree(); -} diff --git a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataChangeListener.java b/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataChangeListener.java deleted file mode 100644 index 21006173f2..0000000000 --- a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataChangeListener.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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.md.sal.common.api.data; - -import java.util.EventListener; - -import org.opendaylight.yangtools.concepts.Path; -/** - * - * - * @deprecated Replaced by {@link AsyncDataChangeEvent} - */ -@Deprecated -public interface DataChangeListener

    , D> extends EventListener { - /** - * Note that this method may be invoked from a shared thread pool, so - * implementations SHOULD NOT perform CPU-intensive operations and they - * definitely MUST NOT invoke any potentially blocking operations. - * - * @param change Data Change Event being delivered. - **/ - void onDataChanged(DataChangeEvent change); -} diff --git a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataChangePublisher.java b/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataChangePublisher.java deleted file mode 100644 index 222dba8eaf..0000000000 --- a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataChangePublisher.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * 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.md.sal.common.api.data; - -import org.opendaylight.yangtools.concepts.ListenerRegistration; -import org.opendaylight.yangtools.concepts.Path; - -/** - * - * @deprecated Replaced by {@link AsyncDataBroker} - */ -@Deprecated -public interface DataChangePublisher

    , D, L extends DataChangeListener> { - - ListenerRegistration registerDataChangeListener(P path, L listener); - -} diff --git a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataCommitHandler.java b/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataCommitHandler.java deleted file mode 100644 index a9f02a8ee5..0000000000 --- a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataCommitHandler.java +++ /dev/null @@ -1,125 +0,0 @@ -/* - * 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.md.sal.common.api.data; - -import org.opendaylight.yangtools.concepts.Path; -import org.opendaylight.yangtools.yang.common.RpcResult; -/** - * Two phase commit handler (cohort) of the two-phase commit protocol of data. - * - *

    - * The provider should expose the implementation of DataCommitHandler if it's - * functionality depends on any subset of data stored in data repositories, in - * order to participate in {@link DataBrokerService#commit(DataStoreIdentifier) - * operation. - * - *

    - * Operations of two-phase commit handlers should not change data in data store, - * this is responsibility of the coordinator (broker or some component of the - * broker). - * - * Commit handlers are responsible for changing the internal state of the - * provider to reflect the committed changes in data. - * - *

    Two-phase commit

    - * - *

    Commit Request Phase

    - * - *
      - *
    1. Consumer edits data by invocation of - * DataBrokerService.editCandidateData(DataStoreIdentifier, DataRoot) - *
    2. Consumer starts a commit by invoking - * DataBrokerService.commit(DataStoreIdentifier) - *
    3. Broker retrieves a list of all registered - * DataCommitHandlers - *
    4. For each DataCommitHandler - *
        - *
      1. Broker invokes a - * DataCommitHandler.requestCommit(DataStoreIdentifier) operation. - *
      2. DataCommitHandler returns a RpcResult with - * CommitTransaction - *
      3. If the result was successful, broker adds CommitTransaction - * to the list of opened transactions. If not, brokers stops a commit request - * phase and starts a rollback phase. - *
      - *
    5. Broker starts a commit finish phase - *
    - * - *

    Commit Finish Phase

    - * - *
      - *
    1. For each CommitTransaction from Commit Request phase - *
        - *
      1. Broker broker invokes a - * CommitTransaction.finish() - *
      2. The provider finishes a commit (applies the change) and returns an - * RpcResult. - *
      - *
    2. - *
        - *
      • If all returned results means successful, the brokers end two-phase - * commit by returning a success commit result to the Consumer. - *
      • If error occured, the broker starts a commit rollback phase. - *
      - *
    - * - *

    Commit Rollback Phase

    - *
  • For each DataCommitTransaction from Commit Request phase - *
      - *
    1. Broker - * broker invokes a {@link DataCommitTransaction#finish()} - *
    2. The provider rollbacks a commit and returns an {@link RpcResult} of - * rollback.
    - *
  • Broker returns a error result to the consumer. - * - * @param

    Class representing a path - * @param Superclass from which all data objects are derived from. - * @deprecated Replaced by {@link AsyncConfigurationCommitHandler} - */ -@Deprecated -public interface DataCommitHandler

    , D> { - - - DataCommitTransaction requestCommit(DataModification modification); - - public interface DataCommitTransaction

    , D> { - - DataModification getModification(); - - /** - * - * Finishes a commit. - * - * This callback is invoked by commit coordinator to finish commit action. - * - * The implementation is required to finish transaction or return unsuccessful - * rpc result if something went wrong. - * - * The provider (commit handler) should apply all changes to its state - * which are a result of data change- - * - * @return - */ - RpcResult finish() throws IllegalStateException; - - /** - * Rollbacks a commit. - * - * This callback is invoked by commit coordinator to finish commit action. - * - * The provider (commit handler) should rollback all changes to its state - * which were a result of previous request commit. - * - * @return - * @throws IllegalStateException - * If the method is invoked after {@link #finish()} - */ - RpcResult rollback() throws IllegalStateException; - } - -} diff --git a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataCommitHandlerRegistration.java b/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataCommitHandlerRegistration.java deleted file mode 100644 index dceb3de5bf..0000000000 --- a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataCommitHandlerRegistration.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2014 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.md.sal.common.api.data; - -import org.opendaylight.yangtools.concepts.Path; -import org.opendaylight.yangtools.concepts.Registration; - -/** - * - * - * @deprecated THis was intended as Registration object, normal use of {@link org.opendaylight.yangtools.concepts.ObjectRegistration} - * is suffiecient, since {@link #getPath()} was implementation leak. - * - * @param

    - * @param - */ -@Deprecated -public interface DataCommitHandlerRegistration

    ,D> extends Registration { - - P getPath(); -} diff --git a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataModification.java b/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataModification.java deleted file mode 100644 index 630078dced..0000000000 --- a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataModification.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * 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.md.sal.common.api.data; - -import java.util.concurrent.Future; - -import org.opendaylight.controller.md.sal.common.api.TransactionStatus; -import org.opendaylight.yangtools.concepts.Path; -import org.opendaylight.yangtools.yang.common.RpcResult; -/** - * - * @deprecated Replaced by {@link AsyncWriteTransaction} - */ -@Deprecated -public interface DataModification

    , D> extends DataChange, DataReader { - /** - * Returns transaction identifier - * - * @return Transaction identifier - */ - Object getIdentifier(); - - TransactionStatus getStatus(); - - /** - * Store a piece of data at specified path. This acts as a merge operation, - * which is to say that any pre-existing data which is not explicitly - * overwritten will be preserved. This means that if you store a container, - * its child lists will be merged. Performing the following put operations: - * - * 1) container { list [ a ] } - * 2) container { list [ b ] } - * - * will result in the following data being present: - * - * container { list [ a, b ] } - * - * This also means that storing the container will preserve any augmentations - * which have been attached to it. - * - * If you require an explicit replace operation, perform - * {@link removeOperationalData} first. - */ - void putOperationalData(P path, D data); - - /** - * Store a piece of data at specified path. This acts as a merge operation, - * which is to say that any pre-existing data which is not explicitly - * overwritten will be preserved. This means that if you store a container, - * its child lists will be merged. Performing the following put operations: - * - * 1) container { list [ a ] } - * 2) container { list [ b ] } - * - * will result in the following data being present: - * - * container { list [ a, b ] } - * - * This also means that storing the container will preserve any augmentations - * which have been attached to it. - * - * If you require an explicit replace operation, perform - * {@link removeConfigurationData} first. - */ - void putConfigurationData(P path, D data); - - void removeOperationalData(P path); - - void removeConfigurationData(P path); - - /** - * Initiates a two-phase commit of modification. - * - *

    - * The successful commit changes the state of the system and may affect - * several components. - * - *

    - * The effects of successful commit of data are described in the - * specifications and YANG models describing the Provider components of - * controller. It is assumed that Consumer has an understanding of this - * changes. - * - * - * @see DataCommitHandler for further information how two-phase commit is - * processed. - * @param store - * Identifier of the store, where commit should occur. - * @return Result of the Commit, containing success information or list of - * encountered errors, if commit was not successful. The Future - * blocks until {@link TransactionStatus#COMMITED} or - * {@link TransactionStatus#FAILED} is reached. - */ - Future> commit(); -} diff --git a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataModificationTransactionFactory.java b/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataModificationTransactionFactory.java deleted file mode 100644 index 6a370b8cd1..0000000000 --- a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataModificationTransactionFactory.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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.md.sal.common.api.data; - -import org.opendaylight.yangtools.concepts.Path; -/** - * - * @deprecated Replaced by {@link AsyncDataTransactionFactory} - */ -@Deprecated -public interface DataModificationTransactionFactory

    ,D> { - - DataModification beginTransaction(); -} diff --git a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataProvider.java b/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataProvider.java deleted file mode 100644 index fdeda2800b..0000000000 --- a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataProvider.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * 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.md.sal.common.api.data; - -import org.opendaylight.yangtools.concepts.Path; - -/** - * - * - * @deprecated Replaced by org.opendaylight.controller.sal.core.spi.data.DOMStore contract. - */ -@Deprecated -public interface DataProvider

    , D> extends DataReader { - -} diff --git a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataProvisionService.java b/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataProvisionService.java deleted file mode 100644 index 6c7166eaee..0000000000 --- a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataProvisionService.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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.md.sal.common.api.data; - -import org.opendaylight.controller.md.sal.common.api.RegistrationListener; -import org.opendaylight.yangtools.concepts.ListenerRegistration; -import org.opendaylight.yangtools.concepts.Path; -import org.opendaylight.yangtools.concepts.Registration; - -/** - * - * - * @deprecated replaced by {@link AsyncDataBroker} and {@link AsyncConfigurationCommitCoordinator} - */ -@Deprecated -public interface DataProvisionService

    , D> { - - public Registration registerCommitHandler(P path, DataCommitHandler commitHandler); - - public ListenerRegistration>> - registerCommitHandlerListener(RegistrationListener> commitHandlerListener); - -} diff --git a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataReader.java b/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataReader.java deleted file mode 100644 index 2f657b8e50..0000000000 --- a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataReader.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * 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.md.sal.common.api.data; - -import org.opendaylight.yangtools.concepts.Path; - -/** - * Reader for reading YANG subtrees based on their path. - * - * Reader is requested to return object at specified path and all it's subnodes - * known to the reader or null if node is not found in this reader. - * - * @param

    Path Type - * @param Data Type - * @deprecated Replaced by org.opendaylight.controller.sal.core.spi.data.DOMStore contract. - */ -@Deprecated -public interface DataReader

    ,D> { - - /** - * Reads data from Operational data store located at provided path - * - * @param path Path to data - * @return - */ - D readOperationalData(P path); - - D readConfigurationData(P path); -} diff --git a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataStore.java b/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataStore.java deleted file mode 100644 index 5688dd0988..0000000000 --- a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataStore.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2014 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.md.sal.common.api.data; - -import org.opendaylight.yangtools.concepts.Path; - -/** - * - * @deprecated Replaced by org.opendaylight.controller.sal.core.spi.data.DOMStore Contract. - */ -@Deprecated -public interface DataStore

    , D> extends // - DataReader, // - DataModificationTransactionFactory { - - @Override - public DataModification beginTransaction(); - - @Override - public D readConfigurationData(P path); - - @Override - public D readOperationalData(P path); - -} diff --git a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/notify/NotificationPublishService.java b/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/notify/NotificationPublishService.java deleted file mode 100644 index 0dd04d539c..0000000000 --- a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/notify/NotificationPublishService.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * 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.md.sal.common.api.notify; - -import java.util.concurrent.ExecutorService; - -/** - * Interface for publishing YANG-modeled notifications. - *

    - * Users of this interface can publish any YANG-modeled notification which will - * be delivered to all subscribed listeners. - *

    - * Preferred way of publishing of notifications is done by invoking {@link #publish(Object)}. - * - *

    You may consider using {@link #publish(Object, ExecutorService)} if and only if - * your use-case requires customized execution policy or run-to-completion - * inside process. - * - *

    - * The metadata required to deliver a notification to the correct listeners is - * extracted from the published notification. - * - * - * FIXME: Consider clarification of execution/delivery policy, how it will be - * affected by Actor model and cluster-wide notifications. - * - * @param - * the type of notifications - */ -public interface NotificationPublishService { - - /** - * Publishes a notification and notifies subscribed listeners. All listener - * notifications are done via a default executor. - *

    - * Note: This call will block when the default executor is saturated - * and the notification queue for this executor is full. - * - * @param notification - * the notification to publish. - */ - void publish(N notification); - - /** - * Publishes a notification and notifies subscribed listeners. All listener - * notifications are done via the provided executor. - *

    - * Note: Use only if necessary. Consider using - * {@link #publish(Object)} for most use-cases. - * - *

    - * By using this method you could customize execution policy of listeners present - * inside process (e.g. using single-threaded executor or even same-thread executor - * delivery. - * - *

    - * This executor is used only for inside-process notification deliveries. - * - * @param notification - * the notification to publish. - * @param executor - * the executor that will be used to deliver notifications to - * subscribed listeners. - */ - void publish(N notification, ExecutorService executor); -} diff --git a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/notify/NotificationSubscriptionService.java b/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/notify/NotificationSubscriptionService.java deleted file mode 100644 index a83610fe91..0000000000 --- a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/notify/NotificationSubscriptionService.java +++ /dev/null @@ -1,16 +0,0 @@ -/* - * 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.md.sal.common.api.notify; - -import java.util.EventListener; -import org.opendaylight.yangtools.concepts.ListenerRegistration; - -public interface NotificationSubscriptionService { - - ListenerRegistration registerNotificationListener(T type, L listener); -} diff --git a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/MutableRoutingTable.java b/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/MutableRoutingTable.java deleted file mode 100644 index 0ecb2c5768..0000000000 --- a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/MutableRoutingTable.java +++ /dev/null @@ -1,18 +0,0 @@ -/* - * 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.md.sal.common.api.routing; - -import org.opendaylight.yangtools.concepts.Mutable; -import org.opendaylight.yangtools.concepts.Path; - -public interface MutableRoutingTable, T> extends RoutingTable, Mutable { - - void setDefaultRoute(T target); - void updateRoute(P path,T target); - void removeRoute(P path); -} diff --git a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/Route.java b/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/Route.java deleted file mode 100644 index 4bfb30f828..0000000000 --- a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/Route.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2014 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.md.sal.common.api.routing; - -import org.opendaylight.yangtools.concepts.Immutable; - -public interface Route extends Immutable { - - C getType(); - - P getPath(); -} diff --git a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/RouteChange.java b/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/RouteChange.java deleted file mode 100644 index 0c04b936b6..0000000000 --- a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/RouteChange.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * 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.md.sal.common.api.routing; - -import java.util.Map; -import java.util.Set; -/** - * Event representing change in RPC routing table. - * - * - * @param Type, which is used to represent Routing context. - * @param

    Type of data tree path, which is used to identify route. - */ -public interface RouteChange { - - /** - * - * Returns a map of removed routes in associated routing contexts. - *

    - * This map represents routes, which were withdrawn from broker local - * routing table and broker may need to forward RPC to other broker - * in order to process RPC request. - * - * @return Map of contexts and removed routes - */ - Map> getRemovals(); - /** - * - * Returns a map of announced routes in associated routing contexts. - * - * This map represents routes, which were announced by broker - * and are present in broker's local routing table. This routes - * are processed by implementations which are registered - * to originating broker. - * - * @return Map of contexts and announced routes - */ - Map> getAnnouncements(); -} diff --git a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/RouteChangeListener.java b/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/RouteChangeListener.java deleted file mode 100644 index b3b6fe6ee9..0000000000 --- a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/RouteChangeListener.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2014 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.md.sal.common.api.routing; - -import java.util.EventListener; -/** - * - * Listener which is interested in receiving RouteChangeEvents - * for its local broker. - *

    - * Listener is registerd via {@link RouteChangePublisher#registerRouteChangeListener(RouteChangeListener)} - * - * - * @param Type, which is used to represent Routing context. - * @param

    Type of data tree path, which is used to identify route. - */ -public interface RouteChangeListener extends EventListener { - - /** - * Callback which is invoked if there is an rpc routing table change. - * - * @param change Event representing change in local RPC routing table. - */ - void onRouteChange(RouteChange change); -} diff --git a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/RouteChangePublisher.java b/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/RouteChangePublisher.java deleted file mode 100644 index dc6b6dd3b7..0000000000 --- a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/RouteChangePublisher.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (c) 2014 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.md.sal.common.api.routing; - -import org.opendaylight.yangtools.concepts.ListenerRegistration; - -/** - * Publishes changes in local RPC routing table to registered listener. - * - * @param Type, which is used to represent Routing context. - * @param

    Type of data tree path, which is used to identify route. - */ -public interface RouteChangePublisher { - - > ListenerRegistration registerRouteChangeListener(L listener); -} diff --git a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/RoutedRegistration.java b/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/RoutedRegistration.java deleted file mode 100644 index 7b1cdeae9f..0000000000 --- a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/RoutedRegistration.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * 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.md.sal.common.api.routing; - -import org.opendaylight.yangtools.concepts.Path; -import org.opendaylight.yangtools.concepts.Registration; - -/** - * Base interface for a routed RPC RPC implementation registration. - * - * @param the context type used for routing - * @param

    the path identifier type - * @param the RPC implementation type - */ -public interface RoutedRegistration, S> extends Registration { - - /** - * Registers the RPC implementation associated with this registration for the given path - * identifier and context. - * - * @param context the context used for routing RPCs to this implementation. - * @param path the path identifier for which to register. - */ - void registerPath(C context, P path); - - /** - * Unregisters the RPC implementation associated with this registration for the given path - * identifier and context. - * - * @param context the context used for routing RPCs to this implementation. - * @param path the path identifier for which to unregister. - */ - void unregisterPath(C context, P path); - - @Override - void close(); -} diff --git a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/Router.java b/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/Router.java deleted file mode 100644 index 6e45ed5cde..0000000000 --- a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/Router.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2014 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.md.sal.common.api.routing; - -import java.util.Map; -import java.util.Set; - -public interface Router extends // - RouteChangePublisher { - - Map> getAnnouncedPaths(); -} diff --git a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/RoutingTable.java b/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/RoutingTable.java deleted file mode 100644 index 9e72b68cd6..0000000000 --- a/common/mdsal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/routing/RoutingTable.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * 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.md.sal.common.api.routing; - -import java.util.Map; - -import org.opendaylight.yangtools.concepts.Path; - -public interface RoutingTable, T> { - - C getIdentifier(); - - T getDefaultRoute(); - - Map getRoutes(); - - T getRoute(P path); -} diff --git a/common/parent/pom.xml b/common/parent/pom.xml index 16d0abeebf..a1b05f4713 100644 --- a/common/parent/pom.xml +++ b/common/parent/pom.xml @@ -129,13 +129,10 @@ jersey-client 2.0 - - org.opendaylight.yangtools - yangtools-artifacts - ${yangtools.version} - import - pom + com.lmax + disruptor + 3.3.0 diff --git a/opendaylight/md-sal/mdsal-artifacts/pom.xml b/dom/mdsal-artifacts/pom.xml similarity index 100% rename from opendaylight/md-sal/mdsal-artifacts/pom.xml rename to dom/mdsal-artifacts/pom.xml diff --git a/opendaylight/md-sal/sal-dom-api/.gitignore b/dom/mdsal-dom-api/.gitignore similarity index 100% rename from opendaylight/md-sal/sal-dom-api/.gitignore rename to dom/mdsal-dom-api/.gitignore diff --git a/opendaylight/md-sal/sal-dom-api/pom.xml b/dom/mdsal-dom-api/pom.xml similarity index 74% rename from opendaylight/md-sal/sal-dom-api/pom.xml rename to dom/mdsal-dom-api/pom.xml index 30a9c7d1b8..6fa699566e 100644 --- a/opendaylight/md-sal/sal-dom-api/pom.xml +++ b/dom/mdsal-dom-api/pom.xml @@ -2,20 +2,16 @@ 4.0.0 - org.opendaylight.controller - sal-parent - 1.3.0-SNAPSHOT + org.opendaylight.mdsal + mdsal-dom + 2.0.0-SNAPSHOT - sal-core-api + mdsal-dom-api bundle - org.opendaylight.controller - config-api - - - org.opendaylight.controller - sal-common-api + org.opendaylight.mdsal + mdsal-common-api org.opendaylight.yangtools @@ -34,10 +30,6 @@ junit junit - - org.opendaylight.controller - sal-test-model - org.opendaylight.yangtools yang-data-impl diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/ClusteredDOMDataChangeListener.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/ClusteredDOMDataChangeListener.java similarity index 100% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/ClusteredDOMDataChangeListener.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/ClusteredDOMDataChangeListener.java diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataBroker.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataBroker.java similarity index 100% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataBroker.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataBroker.java diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataBrokerExtension.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataBrokerExtension.java similarity index 100% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataBrokerExtension.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataBrokerExtension.java diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataChangeListener.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataChangeListener.java similarity index 100% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataChangeListener.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataChangeListener.java diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataReadOnlyTransaction.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataReadOnlyTransaction.java similarity index 100% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataReadOnlyTransaction.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataReadOnlyTransaction.java diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataReadTransaction.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataReadTransaction.java similarity index 100% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataReadTransaction.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataReadTransaction.java diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataReadWriteTransaction.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataReadWriteTransaction.java similarity index 100% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataReadWriteTransaction.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataReadWriteTransaction.java diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeChangeListener.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeChangeListener.java similarity index 100% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeChangeListener.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeChangeListener.java diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeChangeService.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeChangeService.java similarity index 56% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeChangeService.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeChangeService.java index bdd853a1c0..beab014e3e 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeChangeService.java +++ b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeChangeService.java @@ -16,39 +16,33 @@ import org.opendaylight.yangtools.concepts.ListenerRegistration; */ public interface DOMDataTreeChangeService extends DOMDataBrokerExtension { /** - * Registers a {@link DOMDataTreeChangeListener} to receive - * notifications when data changes under a given path in the conceptual data - * tree. + * Registers a {@link DOMDataTreeChangeListener} to receive notifications when data changes + * under a given path in the conceptual data tree. *

    - * You are able to register for notifications for any node or subtree - * which can be represented using {@link DOMDataTreeIdentifier}. + * You are able to register for notifications for any node or subtree which can be represented + * using {@link DOMDataTreeIdentifier}. *

    * - * You are able to register for data change notifications for a subtree or leaf - * even if it does not exist. You will receive notification once that node is - * created. + * You are able to register for data change notifications for a subtree or leaf even if it does + * not exist. You will receive notification once that node is created. *

    * If there is any pre-existing data in the data tree for the path for which you are - * registering, you will receive an initial data change event, which will - * contain all pre-existing data, marked as created. + * registering, you will receive an initial data change event, which will contain all + * pre-existing data, marked as created. * *

    - * This method returns a {@link ListenerRegistration} object. To - * "unregister" your listener for changes call the {@link ListenerRegistration#close()} - * method on the returned object. + * This method returns a {@link ListenerRegistration} object. To "unregister" your listener for + * changes call the {@link ListenerRegistration#close()} method on the returned object. *

    * You MUST explicitly unregister your listener when you no longer want to receive - * notifications. This is especially true in OSGi environments, where failure to - * do so during bundle shutdown can lead to stale listeners being still registered. + * notifications. This is especially true in OSGi environments, where failure to do so during + * bundle shutdown can lead to stale listeners being still registered. * - * @param treeId - * Data tree identifier of the subtree which should be watched for - * changes. - * @param listener - * Listener instance which is being registered - * @return Listener registration object, which may be used to unregister - * your listener using {@link ListenerRegistration#close()} to stop - * delivery of change events. + * @param treeId Data tree identifier of the subtree which should be watched for changes. + * @param listener Listener instance which is being registered + * @param Listener type + * @return Listener registration object, which may be used to unregister your listener using + * {@link ListenerRegistration#close()} to stop delivery of change events. */ @Nonnull ListenerRegistration registerDataTreeChangeListener(@Nonnull DOMDataTreeIdentifier treeId, @Nonnull L listener); } diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeIdentifier.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeIdentifier.java similarity index 100% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeIdentifier.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeIdentifier.java diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeInaccessibleException.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeInaccessibleException.java similarity index 100% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeInaccessibleException.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeInaccessibleException.java diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeListener.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeListener.java similarity index 89% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeListener.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeListener.java index 083cd10ef3..e6a9501207 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeListener.java +++ b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeListener.java @@ -32,11 +32,11 @@ public interface DOMDataTreeListener extends EventListener { void onDataTreeChanged(@Nonnull Collection changes, @Nonnull Map> subtrees); /** - * Invoked when a subtree listening failure occurs. This can be triggered, for example, when - * a connection to external subtree source is broken. The listener will not receive any other + * Invoked when a subtree listening failure occurs. This can be triggered, for example, when a + * connection to external subtree source is broken. The listener will not receive any other * callbacks, but its registration still needs to be closed to prevent resource leak. * - * @param cause Collection of failure causes, may not be null or empty. + * @param causes Collection of failure causes, may not be null or empty. */ void onDataTreeFailed(@Nonnull Collection causes); } diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeListeningException.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeListeningException.java similarity index 100% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeListeningException.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeListeningException.java diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeLoopException.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeLoopException.java similarity index 100% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeLoopException.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeLoopException.java diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeProducer.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeProducer.java similarity index 60% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeProducer.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeProducer.java index cbfa0122f2..3b6071f534 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeProducer.java +++ b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeProducer.java @@ -40,46 +40,44 @@ import javax.annotation.Nonnull; */ public interface DOMDataTreeProducer extends DOMDataTreeProducerFactory, AutoCloseable { /** - * Allocate a new open transaction on this producer. Any and all transactions - * previously allocated must have been either submitted or cancelled by the - * time this method is invoked. + * Allocate a new open transaction on this producer. Any and all transactions previously + * allocated must have been either submitted or cancelled by the time this method is invoked. * - * @param barrier Indicates whether this transaction should be a barrier. A barrier - * transaction is processed separately from any preceding transactions. - * Non-barrier transactions may be merged and processed in a batch, - * such that any observers see the modifications contained in them as - * if the modifications were made in a single transaction. + * @param isolated Indicates whether this transaction should be a barrier. A barrier transaction + * is processed separately from any preceding transactions. Non-barrier transactions may + * be merged and processed in a batch, such that any observers see the modifications + * contained in them as if the modifications were made in a single transaction. * @return A new {@link DOMDataWriteTransaction} - * @throws {@link IllegalStateException} if a previous transaction was not closed. - * @throws {@link IllegalThreadStateException} if the calling thread context does not - * match the lifecycle rules enforced by the producer state (e.g. bound or unbound). - * This exception is thrown on a best effort basis and programs should not rely - * on it for correct operation. + * @throws IllegalStateException if a previous transaction was not closed. + * @throws IllegalThreadStateException if the calling thread context does not match the + * lifecycle rules enforced by the producer state (e.g. bound or unbound). This + * exception is thrown on a best effort basis and programs should not rely on it for + * correct operation. */ @Nonnull DOMDataWriteTransaction createTransaction(boolean isolated); /** * {@inheritDoc} * - * When invoked on a {@link DOMDataTreeProducer}, this method has additional restrictions. - * There may not be an open transaction from this producer. The method needs to be - * invoked in appropriate context, e.g. bound or unbound. + * When invoked on a {@link DOMDataTreeProducer}, this method has additional restrictions. There + * may not be an open transaction from this producer. The method needs to be invoked in + * appropriate context, e.g. bound or unbound. * - * Specified subtrees must be accessible by this producer. Accessible means they are a subset - * of the subtrees specified when the producer is instantiated. The set is further reduced as - * child producers are instantiated -- if you create a producer for /a and then a child for - * /a/b, /a/b is not accessible from the first producer. + * Specified subtrees must be accessible by this producer. Accessible means they are a subset of + * the subtrees specified when the producer is instantiated. The set is further reduced as child + * producers are instantiated -- if you create a producer for /a and then a child for /a/b, /a/b + * is not accessible from the first producer. * - * Once this method returns successfully, this (parent) producer loses the ability to - * access the specified paths until the resulting (child) producer is shut down. + * Once this method returns successfully, this (parent) producer loses the ability to access the + * specified paths until the resulting (child) producer is shut down. * - * @throws {@link IllegalStateException} if there is an open transaction - * @throws {@link IllegalArgumentException} if subtrees contains a subtree which is not - * accessible by this producer - * @throws {@link IllegalThreadStateException} if the calling thread context does not - * match the lifecycle rules enforced by the producer state (e.g. bound or unbound). - * This exception is thrown on a best effort basis and programs should not rely - * on it for correct operation. + * @throws IllegalStateException if there is an open transaction + * @throws IllegalArgumentException if subtrees contains a subtree which is not accessible by + * this producer + * @throws IllegalThreadStateException if the calling thread context does not match the + * lifecycle rules enforced by the producer state (e.g. bound or unbound). This + * exception is thrown on a best effort basis and programs should not rely on it for + * correct operation. */ @Override @Nonnull DOMDataTreeProducer createProducer(@Nonnull Collection subtrees); diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeProducerBusyException.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeProducerBusyException.java similarity index 100% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeProducerBusyException.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeProducerBusyException.java diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeProducerException.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeProducerException.java similarity index 100% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeProducerException.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeProducerException.java diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeProducerFactory.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeProducerFactory.java similarity index 93% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeProducerFactory.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeProducerFactory.java index 89ac8d1e6c..46726da421 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeProducerFactory.java +++ b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeProducerFactory.java @@ -20,7 +20,7 @@ public interface DOMDataTreeProducerFactory { * * @param subtrees The collection of subtrees the resulting producer should have access to. * @return A {@link DOMDataTreeProducer} instance. - * @throws {@link IllegalArgumentException} if subtrees is empty. + * @throws IllegalArgumentException if subtrees is empty. */ @Nonnull DOMDataTreeProducer createProducer(@Nonnull Collection subtrees); } diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeService.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeService.java similarity index 95% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeService.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeService.java index 21ff44c539..4ce6de3d23 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeService.java +++ b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeService.java @@ -58,5 +58,6 @@ public interface DOMDataTreeService extends DOMDataTreeProducerFactory, DOMServi * feedback loop */ @Nonnull ListenerRegistration registerListener(@Nonnull T listener, - @Nonnull Collection subtrees, boolean allowRxMerges, @Nonnull Collection producers); + @Nonnull Collection subtrees, boolean allowRxMerges, + @Nonnull Collection producers) throws DOMDataTreeLoopException; } diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeShard.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeShard.java similarity index 100% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeShard.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeShard.java diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeShardingConflictException.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeShardingConflictException.java similarity index 100% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeShardingConflictException.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeShardingConflictException.java diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeShardingService.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeShardingService.java similarity index 100% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeShardingService.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataTreeShardingService.java diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataWriteTransaction.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataWriteTransaction.java similarity index 95% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataWriteTransaction.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataWriteTransaction.java index b8fe26387b..c81b388b6e 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataWriteTransaction.java +++ b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMDataWriteTransaction.java @@ -58,4 +58,10 @@ public interface DOMDataWriteTransaction extends AsyncWriteTransaction data); + + /** + * {@inheritDoc} + */ + @Override + public void delete(LogicalDatastoreType store, YangInstanceIdentifier path); } diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMEvent.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMEvent.java similarity index 100% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMEvent.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMEvent.java diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMExtensibleService.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMExtensibleService.java similarity index 82% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMExtensibleService.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMExtensibleService.java index 22334420ad..06cefa333b 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMExtensibleService.java +++ b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMExtensibleService.java @@ -12,12 +12,11 @@ import java.util.Map; import javax.annotation.Nonnull; /** - * Marker interface for services which can support {@link DOMServiceExtension}. - * Aside for marking these, they also provide runtime query to detect whether - * a particular trait is in fact available. + * Marker interface for services which can support {@link DOMServiceExtension}. Aside for marking + * these, they also provide runtime query to detect whether a particular trait is in fact available. * - * Base {@link DOMService} - * Extension type + * @param Base {@link DOMService} + * @param Extension type */ @Beta public interface DOMExtensibleService, E extends DOMServiceExtension> extends DOMService { diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMMountPoint.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMMountPoint.java similarity index 100% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMMountPoint.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMMountPoint.java diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMMountPointService.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMMountPointService.java similarity index 100% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMMountPointService.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMMountPointService.java diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMNotification.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMNotification.java similarity index 100% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMNotification.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMNotification.java diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMNotificationListener.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMNotificationListener.java similarity index 100% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMNotificationListener.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMNotificationListener.java diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMNotificationPublishService.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMNotificationPublishService.java similarity index 57% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMNotificationPublishService.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMNotificationPublishService.java index a7d2770172..691afeff5c 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMNotificationPublishService.java +++ b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMNotificationPublishService.java @@ -32,41 +32,36 @@ public interface DOMNotificationPublishService extends DOMService, BrokerService ListenableFuture REJECTED = Futures.immediateFailedFuture(new DOMNotificationRejectedException("Unacceptable blocking conditions encountered")); /** - * Publish a notification. The result of this method is a {@link ListenableFuture} - * which will complete once the notification has been delivered to all immediate - * registrants. The type of the object resulting from the future is not defined - * and implementations may use it to convey additional information related to the - * publishing process. + * Publish a notification. The result of this method is a {@link ListenableFuture} which will + * complete once the notification has been delivered to all immediate registrants. The type of + * the object resulting from the future is not defined and implementations may use it to convey + * additional information related to the publishing process. * - * Abstract subclasses can refine the return type as returning a promise of a - * more specific type, e.g.: + * Abstract subclasses can refine the return type as returning a promise of a more specific + * type, e.g.: * - * public interface DeliveryStatus { int getListenerCount(); } - * ListenableFuture putNotification(DOMNotification notification); + * public interface DeliveryStatus { int getListenerCount(); } ListenableFuture<? extends + * DeliveryStatus>[ putNotification(DOMNotification notification); * - * Once the Future succeeds, the resulting object can be queried for traits using - * instanceof, e.g: + * Once the Future succeeds, the resulting object can be queried for traits using instanceof, + * e.g: * - * // Can block when (for example) the implemention's ThreadPool queue is full - * Object o = service.putNotification(notif).get(); - * if (o instanceof DeliveryStatus) { - * DeliveryStatus ds = (DeliveryStatus)o; - * LOG.debug("Notification was received by {} listeners", ds.getListenerCount();); - * } - * } + * // Can block when (for example) the implemention's ThreadPool queue is full Object o = + * service.putNotification(notif).get(); if (o instanceof DeliveryStatus) { DeliveryStatus ds = + * (DeliveryStatus)o; LOG.debug("Notification was received by {} listeners", + * ds.getListenerCount();); } } * - * In case an implementation is running out of resources, it can block the calling - * thread until enough resources become available to accept the notification for - * processing, or it is interrupted. + * In case an implementation is running out of resources, it can block the calling thread until + * enough resources become available to accept the notification for processing, or it is + * interrupted. * - * Caution: completion here means that the implementation has completed processing - * of the notification. This does not mean that all existing registrants - * have seen the notification. Most importantly, the delivery process at - * other cluster nodes may have not begun yet. + * Caution: completion here means that the implementation has completed processing of the + * notification. This does not mean that all existing registrants have seen the notification. + * Most importantly, the delivery process at other cluster nodes may have not begun yet. * * @param notification Notification to be published. - * @return A listenable future which will report completion when the service - * has finished propagating the notification to its immediate registrants. + * @return A listenable future which will report completion when the service has finished + * propagating the notification to its immediate registrants. * @throws InterruptedException if interrupted while waiting * @throws NullPointerException if notification is null. */ @@ -74,36 +69,36 @@ public interface DOMNotificationPublishService extends DOMService, BrokerService /** * Attempt to publish a notification. The result of this method is a {@link ListenableFuture} - * which will complete once the notification has been delivered to all immediate - * registrants. The type of the object resulting from the future is not defined - * and implementations may use it to convey additional information related to the - * publishing process. Unlike {@link #putNotification(DOMNotification)}, this method - * is guaranteed not to block if the underlying implementation encounters contention. + * which will complete once the notification has been delivered to all immediate registrants. + * The type of the object resulting from the future is not defined and implementations may use + * it to convey additional information related to the publishing process. Unlike + * {@link #putNotification(DOMNotification)}, this method is guaranteed not to block if the + * underlying implementation encounters contention. * * @param notification Notification to be published. - * @return A listenable future which will report completion when the service - * has finished propagating the notification to its immediate registrants, - * or {@value #REJECTED} if resource constraints prevent - * the implementation from accepting the notification for delivery. + * @return A listenable future which will report completion when the service has finished + * propagating the notification to its immediate registrants, or {@link #REJECTED} if + * resource constraints prevent the implementation from accepting the notification for + * delivery. * @throws NullPointerException if notification is null. */ @Nonnull ListenableFuture offerNotification(@Nonnull DOMNotification notification); /** * Attempt to publish a notification. The result of this method is a {@link ListenableFuture} - * which will complete once the notification has been delivered to all immediate - * registrants. The type of the object resulting from the future is not defined - * and implementations may use it to convey additional information related to the - * publishing process. Unlike {@link #putNotification(DOMNotification)}, this method - * is guaranteed to block more than the specified timeout. + * which will complete once the notification has been delivered to all immediate registrants. + * The type of the object resulting from the future is not defined and implementations may use + * it to convey additional information related to the publishing process. Unlike + * {@link #putNotification(DOMNotification)}, this method is guaranteed to block more than the + * specified timeout. * * @param notification Notification to be published. * @param timeout how long to wait before giving up, in units of unit * @param unit a TimeUnit determining how to interpret the timeout parameter - * @return A listenable future which will report completion when the service - * has finished propagating the notification to its immediate registrants, - * or {@value #REJECTED} if resource constraints prevent - * the implementation from accepting the notification for delivery. + * @return A listenable future which will report completion when the service has finished + * propagating the notification to its immediate registrants, or {@link #REJECTED} if + * resource constraints prevent the implementation from accepting the notification for + * delivery. * @throws InterruptedException if interrupted while waiting * @throws NullPointerException if notification or unit is null. * @throws IllegalArgumentException if timeout is negative. diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMNotificationRejectedException.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMNotificationRejectedException.java similarity index 99% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMNotificationRejectedException.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMNotificationRejectedException.java index 4d0aa665ea..99d7ed80f9 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMNotificationRejectedException.java +++ b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMNotificationRejectedException.java @@ -11,7 +11,7 @@ package org.opendaylight.controller.md.sal.dom.api; *

    * This exception indicates that given notification can not be processed by corresponding mechanism. * More info can be provided in message. - *

    + *

    *

    * Expected use: {@link DOMNotificationPublishService} *

    diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMNotificationService.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMNotificationService.java similarity index 69% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMNotificationService.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMNotificationService.java index 036ea24cb1..b00efcb007 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMNotificationService.java +++ b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMNotificationService.java @@ -19,15 +19,15 @@ import org.opendaylight.yangtools.yang.model.api.SchemaPath; */ public interface DOMNotificationService extends DOMService, BrokerService { /** - * Register a {@link DOMNotificationListener} to receive a set of notifications. As with - * other ListenerRegistration-based interfaces, registering an instance multiple times - * results in notifications being delivered for each registration. + * Register a {@link DOMNotificationListener} to receive a set of notifications. As with other + * ListenerRegistration-based interfaces, registering an instance multiple times results in + * notifications being delivered for each registration. * * @param listener Notification instance to register - * @param types Notification types which should be delivered to the listener. Duplicate - * entries are processed only once, null entries are ignored. - * @return Registration handle. Invoking {@link DOMNotificationListenerRegistration#close()} - * will stop the delivery of notifications to the listener + * @param types Notification types which should be delivered to the listener. Duplicate entries + * are processed only once, null entries are ignored. + * @return Registration handle. Invoking {@link ListenerRegistration#close()} will stop the + * delivery of notifications to the listener * @throws IllegalArgumentException if types is empty or contains an invalid element, such as * null or a SchemaPath which does not represent a valid {@link DOMNotification} type. * @throws NullPointerException if either of the arguments is null @@ -35,15 +35,15 @@ public interface DOMNotificationService extends DOMService, BrokerService { ListenerRegistration registerNotificationListener(@Nonnull T listener, @Nonnull Collection types); /** - * Register a {@link DOMNotificationListener} to receive a set of notifications. As with - * other ListenerRegistration-based interfaces, registering an instance multiple times - * results in notifications being delivered for each registration. + * Register a {@link DOMNotificationListener} to receive a set of notifications. As with other + * ListenerRegistration-based interfaces, registering an instance multiple times results in + * notifications being delivered for each registration. * * @param listener Notification instance to register - * @param types Notification types which should be delivered to the listener. Duplicate - * entries are processed only once, null entries are ignored. - * @return Registration handle. Invoking {@link DOMNotificationListenerRegistration#close()} - * will stop the delivery of notifications to the listener + * @param types Notification types which should be delivered to the listener. Duplicate entries + * are processed only once, null entries are ignored. + * @return Registration handle. Invoking {@link ListenerRegistration#close()} will stop the + * delivery of notifications to the listener * @throws IllegalArgumentException if types is empty or contains an invalid element, such as * null or a SchemaPath which does not represent a valid {@link DOMNotification} type. * @throws NullPointerException if listener is null diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcAvailabilityListener.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcAvailabilityListener.java similarity index 100% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcAvailabilityListener.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcAvailabilityListener.java diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcException.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcException.java similarity index 100% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcException.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcException.java diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcIdentifier.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcIdentifier.java similarity index 100% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcIdentifier.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcIdentifier.java diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcImplementation.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcImplementation.java similarity index 100% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcImplementation.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcImplementation.java diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcImplementationNotAvailableException.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcImplementationNotAvailableException.java similarity index 100% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcImplementationNotAvailableException.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcImplementationNotAvailableException.java diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcImplementationRegistration.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcImplementationRegistration.java similarity index 100% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcImplementationRegistration.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcImplementationRegistration.java diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcProviderService.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcProviderService.java similarity index 100% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcProviderService.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcProviderService.java diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcResult.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcResult.java similarity index 100% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcResult.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcResult.java diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcService.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcService.java similarity index 79% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcService.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcService.java index 48f6ab6500..9b1b9620fa 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcService.java +++ b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMRpcService.java @@ -38,15 +38,16 @@ public interface DOMRpcService extends DOMService { * about RPC implementations becoming (un)available. The listener will be invoked with the * current implementations reported and will be kept uptodate as implementations come and go. * - * Users should note that using a listener does not necessarily mean that {@link #invokeRpc(SchemaPath, NormalizedNode)} - * will not report a failure due to {@link DOMRpcImplementationNotAvailableException} and - * need to be ready to handle it. Implementations are encouraged to take reasonable precautions - * to prevent this scenario from occurring. + * Users should note that using a listener does not necessarily mean that + * {@link #invokeRpc(SchemaPath, NormalizedNode)} will not report a failure due to + * {@link DOMRpcImplementationNotAvailableException} and need to be ready to handle it. + * Implementations are encouraged to take reasonable precautions to prevent this scenario from + * occurring. * * @param listener {@link DOMRpcAvailabilityListener} instance to register - * @return A {@link DOMRpcAvailabilityListenerRegistration} representing this registration. Performing - * a {@link DOMRpcAvailabilityListenerRegistration#close()} will cancel it. Returned object - * is guaranteed to be non-null. + * @return A {@link ListenerRegistration} representing this registration. Performing a + * {@link ListenerRegistration#close()} will cancel it. Returned object is guaranteed to + * be non-null. */ @Nonnull ListenerRegistration registerRpcListener(@Nonnull T listener); } diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMService.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMService.java similarity index 100% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMService.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMService.java diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMServiceExtension.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMServiceExtension.java similarity index 100% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMServiceExtension.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMServiceExtension.java diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMTransactionChain.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMTransactionChain.java similarity index 100% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMTransactionChain.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/md/sal/dom/api/DOMTransactionChain.java diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Broker.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Broker.java similarity index 91% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Broker.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Broker.java index 500dce3cfa..b6776565d5 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Broker.java +++ b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Broker.java @@ -38,12 +38,6 @@ public interface Broker { * Registers the {@link Consumer}, which will use the SAL layer. * *

    - * During the registration, the broker obtains the initial functionality - * from consumer, using the {@link Consumer#getConsumerFunctionality()}, and - * register that functionality into system and concrete infrastructure - * services. - * - *

    * Note that consumer could register additional functionality at later point * by using service and functionality specific APIs. * @@ -73,11 +67,6 @@ public interface Broker { * Registers the {@link Provider}, which will use the SAL layer. * *

    - * During the registration, the broker obtains the initial functionality - * from consumer, using the {@link Provider#getProviderFunctionality()}, and - * register that functionality into system and concrete infrastructure - * services. - *

    * The consumer is required to use returned session for all * communication with broker or one of the broker services. The session is * announced to the consumer by invoking diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/BrokerService.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/BrokerService.java similarity index 100% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/BrokerService.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/BrokerService.java diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Consumer.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Consumer.java similarity index 72% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Consumer.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Consumer.java index a5ab8ac911..1e9f4d31e0 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Consumer.java +++ b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Consumer.java @@ -37,24 +37,4 @@ public interface Consumer { */ public void onSessionInitiated(ConsumerSession session); - /** - * @deprecated - no longer used or needed - * * - * Suggested implementation until removed: - * @code { - * public Collection getConsumerFunctionality() { - * return Collections.emptySet(); - * } - * } - */ - @Deprecated - public Collection getConsumerFunctionality(); - - /** - * @deprecated - no longer used or needed - */ - @Deprecated - public interface ConsumerFunctionality { - - } } diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Provider.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Provider.java similarity index 73% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Provider.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Provider.java index 4f32983f84..61e4d8989b 100644 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Provider.java +++ b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/Provider.java @@ -40,25 +40,4 @@ public interface Provider { * Unique session between provider and SAL. */ public void onSessionInitiated(ProviderSession session); - - /** - * @deprecated - No longer used or needed - * - * Suggested implementation until removed: - * @code { - * public Collection getProviderFunctionality() { - * return Collections.emptySet(); - * } - * } - */ - @Deprecated - public Collection getProviderFunctionality(); - - /** - * @deprecated - no longer used or needed - */ - @Deprecated - public interface ProviderFunctionality { - - } } diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/model/SchemaService.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/model/SchemaService.java similarity index 100% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/model/SchemaService.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/model/SchemaService.java diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/mount/MountProvisionListener.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/mount/MountProvisionListener.java similarity index 100% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/mount/MountProvisionListener.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/mount/MountProvisionListener.java diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/package-info.java b/dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/package-info.java similarity index 100% rename from opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/package-info.java rename to dom/mdsal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/package-info.java diff --git a/opendaylight/md-sal/sal-dom-api/src/test/java/org/opendaylight/controller/md/sal/dom/api/AbstractDOMDataTreeServiceTestSuite.java b/dom/mdsal-dom-api/src/test/java/org/opendaylight/controller/md/sal/dom/api/AbstractDOMDataTreeServiceTestSuite.java similarity index 100% rename from opendaylight/md-sal/sal-dom-api/src/test/java/org/opendaylight/controller/md/sal/dom/api/AbstractDOMDataTreeServiceTestSuite.java rename to dom/mdsal-dom-api/src/test/java/org/opendaylight/controller/md/sal/dom/api/AbstractDOMDataTreeServiceTestSuite.java diff --git a/dom/mdsal-dom-broker/pom.xml b/dom/mdsal-dom-broker/pom.xml new file mode 100644 index 0000000000..0b26401961 --- /dev/null +++ b/dom/mdsal-dom-broker/pom.xml @@ -0,0 +1,105 @@ + + + 4.0.0 + + org.opendaylight.mdsal + mdsal-dom + 2.0.0-SNAPSHOT + + mdsal-dom-broker + bundle + + + + org.osgi + org.osgi.core + + + com.google.guava + guava + + + com.lmax + disruptor + + + org.opendaylight.mdsal + mdsal-dom-api + + + org.opendaylight.mdsal + mdsal-dom-spi + + + org.opendaylight.mdsal + mdsal-dom-inmemory-datastore + + + org.opendaylight.yangtools + util + + + org.opendaylight.yangtools + yang-data-impl + + + org.opendaylight.yangtools + yang-parser-impl + + + + junit + junit + + + org.slf4j + slf4j-api + + + + org.opendaylight.yangtools + mockito-configuration + test + + + org.slf4j + slf4j-simple + test + + + + + + + org.apache.felix + maven-bundle-plugin + true + + + ${project.groupId}.${project.artifactId} + org.opendaylight.mdsal.sal.dom.broker.osgi.SchemaServiceActivator + + + org.opendaylight.mdsal.sal.dom.broker, + org.opendaylight.mdsal.sal.dom.broker.impl, + org.opendaylight.mdsal.sal.dom.broker.osgi, + org.opendaylight.mdsal.sal.dom.broker.util, + org.opendaylight.mdsal.sal.dom.broker.spi, + + + org.opendaylight.mdsal.md.sal.dom.broker.impl, + org.opendaylight.mdsal.md.sal.dom.broker.impl.*, + + * + + + + + + + scm:git:http://git.opendaylight.org/gerrit/controller.git + scm:git:ssh://git.opendaylight.org:29418/controller.git + HEAD + https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL + + diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/AbstractDOMDataBroker.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/AbstractDOMDataBroker.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/AbstractDOMDataBroker.java rename to dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/AbstractDOMDataBroker.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/AbstractDOMForwardedCompositeTransaction.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/AbstractDOMForwardedCompositeTransaction.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/AbstractDOMForwardedCompositeTransaction.java rename to dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/AbstractDOMForwardedCompositeTransaction.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/AbstractDOMForwardedTransactionFactory.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/AbstractDOMForwardedTransactionFactory.java similarity index 73% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/AbstractDOMForwardedTransactionFactory.java rename to dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/AbstractDOMForwardedTransactionFactory.java index 8ee928e878..e96bf37b03 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/AbstractDOMForwardedTransactionFactory.java +++ b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/AbstractDOMForwardedTransactionFactory.java @@ -83,16 +83,15 @@ abstract class AbstractDOMForwardedTransactionFactory txns = new EnumMap<>(LogicalDatastoreType.class); - for (Entry store : storeTxFactories.entrySet()) { + for (final Entry store : storeTxFactories.entrySet()) { txns.put(store.getKey(), store.getValue().newReadOnlyTransaction()); } return new DOMForwardedReadOnlyTransaction(newTransactionIdentifier(), txns); @@ -110,46 +109,43 @@ abstract class AbstractDOMForwardedTransactionFactory - * Creates a new composite write-only transaction backed by one write-only - * transaction per factory in {@link #getTxFactories()}. + * Creates a new composite write-only transaction backed by one write-only transaction per + * factory in {@link #getTxFactories()}. * *

    * Implementation of composite Write-only transaction is following: * *

      *
    • - * {@link DOMDataWriteTransaction#put(LogicalDatastoreType, org.opendaylight.yangtools.yang.data.api.InstanceIdentifier, org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode)} + * {@link DOMDataWriteTransaction#put(LogicalDatastoreType, org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier, org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode)} * - backing subtransaction is selected by {@link LogicalDatastoreType}, - * {@link DOMStoreWriteTransaction#write(org.opendaylight.yangtools.yang.data.api.InstanceIdentifier, org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode)} - * is invoked on selected subtransaction. + * {@link DOMStoreWriteTransaction#write(org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier, org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode)} + * is invoked on selected subtransaction.
      • *
    • - * {@link DOMDataWriteTransaction#merge(LogicalDatastoreType, org.opendaylight.yangtools.yang.data.api.InstanceIdentifier, org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode)} + * {@link DOMDataWriteTransaction#merge(LogicalDatastoreType, org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier, org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode)} * - backing subtransaction is selected by {@link LogicalDatastoreType}, - * {@link DOMStoreWriteTransaction#merge(org.opendaylight.yangtools.yang.data.api.InstanceIdentifier, org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode)} - * is invoked on selected subtransaction. + * {@link DOMStoreWriteTransaction#merge(org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier, org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode)} + * is invoked on selected subtransaction.
      • *
    • - * {@link DOMDataWriteTransaction#delete(LogicalDatastoreType, org.opendaylight.yangtools.yang.data.api.InstanceIdentifier) + * {@link DOMDataWriteTransaction#delete(LogicalDatastoreType, org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier)} * - backing subtransaction is selected by {@link LogicalDatastoreType}, - * {@link DOMStoreWriteTransaction#delete(org.opendaylight.yangtools.yang.data.api.InstanceIdentifier)} is invoked on - * selected subtransaction. + * {@link DOMStoreWriteTransaction#delete(org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier)} + * is invoked on selected subtransaction. *
    • {@link DOMDataWriteTransaction#commit()} - results in invoking - * {@link DOMStoreWriteTransaction#ready()}, gathering all resulting cohorts - * and then invoking finalized implementation callback - * {@link #submit(DOMDataWriteTransaction, Iterable)} with transaction which - * was commited and gathered results. + * {@link DOMStoreWriteTransaction#ready()}, gathering all resulting cohorts and then invoking + * finalized implementation callback {@link #submit(DOMDataWriteTransaction, Collection)} with + * transaction which was commited and gathered results.
      • *
    * - * Id of returned transaction is generated via - * {@link #newTransactionIdentifier()}. + * Id of returned transaction is generated via {@link #newTransactionIdentifier()}. * - * @return New composite write-only transaction associated with this - * factory. + * @return New composite write-only transaction associated with this factory. */ public final DOMDataWriteTransaction newWriteOnlyTransaction() { checkNotClosed(); final Map txns = new EnumMap<>(LogicalDatastoreType.class); - for (Entry store : storeTxFactories.entrySet()) { + for (final Entry store : storeTxFactories.entrySet()) { txns.put(store.getKey(), store.getValue().newWriteOnlyTransaction()); } return new DOMForwardedWriteTransaction(newTransactionIdentifier(), txns, this); @@ -159,51 +155,42 @@ abstract class AbstractDOMForwardedTransactionFactory - * Creates a new composite write-only transaction backed by one write-only - * transaction per factory in {@link #getTxFactories()}. + * Creates a new composite write-only transaction backed by one write-only transaction per + * factory in {@link #getTxFactories()}. *

    * Implementation of composite Write-only transaction is following: * *

      *
    • - * {@link DOMDataWriteTransaction#read(LogicalDatastoreType, org.opendaylight.yangtools.yang.data.api.InstanceIdentifier)} - * - backing subtransaction is selected by {@link LogicalDatastoreType}, - * {@link DOMStoreWriteTransaction#read(org.opendaylight.yangtools.yang.data.api.InstanceIdentifier)} is invoked on - * selected subtransaction. - *
    • - * {@link DOMDataWriteTransaction#put(LogicalDatastoreType, org.opendaylight.yangtools.yang.data.api.InstanceIdentifier, org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode)} + * {@link DOMDataWriteTransaction#put(LogicalDatastoreType, org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier, org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode)} * - backing subtransaction is selected by {@link LogicalDatastoreType}, - * {@link DOMStoreWriteTransaction#write(org.opendaylight.yangtools.yang.data.api.InstanceIdentifier, org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode)} - * is invoked on selected subtransaction. + * {@link DOMStoreWriteTransaction#write(org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier, org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode)} + * is invoked on selected subtransaction.
      • *
    • - * {@link DOMDataWriteTransaction#merge(LogicalDatastoreType, org.opendaylight.yangtools.yang.data.api.InstanceIdentifier, org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode)} + * {@link DOMDataWriteTransaction#merge(LogicalDatastoreType, org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier, org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode)} * - backing subtransaction is selected by {@link LogicalDatastoreType}, - * {@link DOMStoreWriteTransaction#merge(org.opendaylight.yangtools.yang.data.api.InstanceIdentifier, org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode)} - * is invoked on selected subtransaction. + * {@link DOMStoreWriteTransaction#merge(org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier, org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode)} + * is invoked on selected subtransaction.
      • *
    • - * {@link DOMDataWriteTransaction#delete(LogicalDatastoreType, org.opendaylight.yangtools.yang.data.api.InstanceIdentifier) + * {@link DOMDataWriteTransaction#delete(LogicalDatastoreType, org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier)} * - backing subtransaction is selected by {@link LogicalDatastoreType}, - * {@link DOMStoreWriteTransaction#delete(org.opendaylight.yangtools.yang.data.api.InstanceIdentifier)} is invoked on - * selected subtransaction. + * {@link DOMStoreWriteTransaction#delete(org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier)} + * is invoked on selected subtransaction.
      • *
    • {@link DOMDataWriteTransaction#commit()} - results in invoking - * {@link DOMStoreWriteTransaction#ready()}, gathering all resulting cohorts - * and then invoking finalized implementation callback - * {@link #submit(DOMDataWriteTransaction, Iterable)} with transaction which - * was commited and gathered results. - *
    • + * {@link DOMStoreWriteTransaction#ready()}, gathering all resulting cohorts and then invoking + * finalized implementation callback {@link #submit(DOMDataWriteTransaction, Collection)} with + * transaction which was commited and gathered results.
      • *
    * - * Id of returned transaction is generated via - * {@link #newTransactionIdentifier()}. + * Id of returned transaction is generated via {@link #newTransactionIdentifier()}. * - * @return New composite read-write transaction associated with this - * factory. + * @return New composite read-write transaction associated with this factory. */ public final DOMDataReadWriteTransaction newReadWriteTransaction() { checkNotClosed(); final Map txns = new EnumMap<>(LogicalDatastoreType.class); - for (Entry store : storeTxFactories.entrySet()) { + for (final Entry store : storeTxFactories.entrySet()) { txns.put(store.getKey(), store.getValue().newReadWriteTransaction()); } return new DOMForwardedReadWriteTransaction(newTransactionIdentifier(), txns, this); diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/AbstractDOMRpcRoutingTableEntry.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/AbstractDOMRpcRoutingTableEntry.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/AbstractDOMRpcRoutingTableEntry.java rename to dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/AbstractDOMRpcRoutingTableEntry.java diff --git a/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/CommitCompatibility.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/CommitCompatibility.java new file mode 100644 index 0000000000..66cfdf1c72 --- /dev/null +++ b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/CommitCompatibility.java @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2015 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.md.sal.dom.broker.impl; + +import com.google.common.util.concurrent.AsyncFunction; +import com.google.common.util.concurrent.CheckedFuture; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; +import org.opendaylight.controller.md.sal.common.api.TransactionStatus; +import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; +import org.opendaylight.yangtools.yang.common.RpcResult; +import org.opendaylight.yangtools.yang.common.RpcResultBuilder; + +class CommitCompatibility { + private static final ListenableFuture> SUCCESS_FUTURE = Futures + .immediateFuture(RpcResultBuilder.success(TransactionStatus.COMMITED).build()); + + private CommitCompatibility() { + throw new UnsupportedOperationException("Helper class"); + } + + static ListenableFuture> convertToLegacyCommitFuture( + final CheckedFuture from) { + return Futures.transform(from, new AsyncFunction>() { + @Override + public ListenableFuture> apply(final Void input) { + return SUCCESS_FUTURE; + } + }); + } +} diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/CommitCoordinationTask.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/CommitCoordinationTask.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/CommitCoordinationTask.java rename to dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/CommitCoordinationTask.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMDataBrokerTransactionChainImpl.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMDataBrokerTransactionChainImpl.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMDataBrokerTransactionChainImpl.java rename to dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMDataBrokerTransactionChainImpl.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMForwardedReadOnlyTransaction.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMForwardedReadOnlyTransaction.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMForwardedReadOnlyTransaction.java rename to dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMForwardedReadOnlyTransaction.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMForwardedReadWriteTransaction.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMForwardedReadWriteTransaction.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMForwardedReadWriteTransaction.java rename to dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMForwardedReadWriteTransaction.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMForwardedWriteTransaction.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMForwardedWriteTransaction.java similarity index 96% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMForwardedWriteTransaction.java rename to dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMForwardedWriteTransaction.java index bc11f122e6..19a3707bd6 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMForwardedWriteTransaction.java +++ b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMForwardedWriteTransaction.java @@ -19,7 +19,6 @@ import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; import org.opendaylight.controller.md.sal.common.api.TransactionStatus; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; -import org.opendaylight.controller.md.sal.common.impl.service.AbstractDataTransaction; import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction; import org.opendaylight.controller.sal.core.spi.data.DOMStoreThreePhaseCommitCohort; import org.opendaylight.controller.sal.core.spi.data.DOMStoreWriteTransaction; @@ -125,7 +124,7 @@ class DOMForwardedWriteTransaction extends @Deprecated @Override public ListenableFuture> commit() { - return AbstractDataTransaction.convertToLegacyCommitFuture(submit()); + return CommitCompatibility.convertToLegacyCommitFuture(submit()); } @Override @@ -137,7 +136,7 @@ class DOMForwardedWriteTransaction extends final Collection cohorts = new ArrayList<>(txns.size()); // FIXME: deal with errors thrown by backed (ready and submit can fail in theory) - for (DOMStoreWriteTransaction txn : txns) { + for (final DOMStoreWriteTransaction txn : txns) { cohorts.add(txn.ready()); } diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMNotificationRouter.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMNotificationRouter.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMNotificationRouter.java rename to dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMNotificationRouter.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMNotificationRouterEvent.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMNotificationRouterEvent.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMNotificationRouterEvent.java rename to dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMNotificationRouterEvent.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMRpcRouter.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMRpcRouter.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMRpcRouter.java rename to dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMRpcRouter.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMRpcRoutingTable.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMRpcRoutingTable.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMRpcRoutingTable.java rename to dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMRpcRoutingTable.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/GlobalDOMRpcRoutingTableEntry.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/GlobalDOMRpcRoutingTableEntry.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/GlobalDOMRpcRoutingTableEntry.java rename to dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/GlobalDOMRpcRoutingTableEntry.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongDataBroker.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongDataBroker.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongDataBroker.java rename to dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongDataBroker.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongFuture.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongFuture.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongFuture.java rename to dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongFuture.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongTransaction.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongTransaction.java similarity index 94% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongTransaction.java rename to dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongTransaction.java index 51b28e1450..9e720d91d4 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongTransaction.java +++ b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongTransaction.java @@ -16,7 +16,6 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; import org.opendaylight.controller.md.sal.common.api.TransactionStatus; import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; -import org.opendaylight.controller.md.sal.common.impl.service.AbstractDataTransaction; import org.opendaylight.controller.md.sal.dom.api.DOMDataReadWriteTransaction; import org.opendaylight.yangtools.yang.common.RpcResult; @@ -36,7 +35,7 @@ final class PingPongTransaction implements FutureCallback { this.delegate = Preconditions.checkNotNull(delegate); future = SettableFuture.create(); submitFuture = new PingPongFuture(future); - commitFuture = AbstractDataTransaction.convertToLegacyCommitFuture(submitFuture); + commitFuture = CommitCompatibility.convertToLegacyCommitFuture(submitFuture); } DOMDataReadWriteTransaction getTransaction() { diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongTransactionChain.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongTransactionChain.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongTransactionChain.java rename to dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongTransactionChain.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/RoutedDOMRpcRoutingTableEntry.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/RoutedDOMRpcRoutingTableEntry.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/RoutedDOMRpcRoutingTableEntry.java rename to dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/RoutedDOMRpcRoutingTableEntry.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/SerializedDOMDataBroker.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/SerializedDOMDataBroker.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/SerializedDOMDataBroker.java rename to dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/SerializedDOMDataBroker.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/ShardRegistration.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/ShardRegistration.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/ShardRegistration.java rename to dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/ShardRegistration.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/ShardedDOMDataTree.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/ShardedDOMDataTree.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/ShardedDOMDataTree.java rename to dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/ShardedDOMDataTree.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/ShardedDOMDataTreeProducer.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/ShardedDOMDataTreeProducer.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/ShardedDOMDataTreeProducer.java rename to dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/ShardedDOMDataTreeProducer.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/ShardedDOMDataWriteTransaction.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/ShardedDOMDataWriteTransaction.java similarity index 91% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/ShardedDOMDataWriteTransaction.java rename to dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/ShardedDOMDataWriteTransaction.java index 33f15e3f67..c2bf9850d4 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/ShardedDOMDataWriteTransaction.java +++ b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/ShardedDOMDataWriteTransaction.java @@ -23,7 +23,6 @@ import javax.annotation.concurrent.NotThreadSafe; import org.opendaylight.controller.md.sal.common.api.TransactionStatus; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; -import org.opendaylight.controller.md.sal.common.impl.service.AbstractDataTransaction; import org.opendaylight.controller.md.sal.dom.api.DOMDataTreeIdentifier; import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction; import org.opendaylight.controller.sal.core.spi.data.DOMStoreThreePhaseCommitCohort; @@ -55,7 +54,7 @@ final class ShardedDOMDataWriteTransaction implements DOMDataWriteTransaction { private DOMStoreWriteTransaction lookup(final LogicalDatastoreType store, final YangInstanceIdentifier path) { final DOMDataTreeIdentifier id = new DOMDataTreeIdentifier(store, path); - for (Entry e : idToTransaction.entrySet()) { + for (final Entry e : idToTransaction.entrySet()) { if (e.getKey().contains(id)) { return e.getValue(); } @@ -76,7 +75,7 @@ final class ShardedDOMDataWriteTransaction implements DOMDataWriteTransaction { } LOG.debug("Cancelling transaction {}", identifier); - for (DOMStoreWriteTransaction tx : ImmutableSet.copyOf(idToTransaction.values())) { + for (final DOMStoreWriteTransaction tx : ImmutableSet.copyOf(idToTransaction.values())) { tx.close(); } @@ -91,13 +90,13 @@ final class ShardedDOMDataWriteTransaction implements DOMDataWriteTransaction { final Set txns = ImmutableSet.copyOf(idToTransaction.values()); final List cohorts = new ArrayList<>(txns.size()); - for (DOMStoreWriteTransaction tx : txns) { + for (final DOMStoreWriteTransaction tx : txns) { cohorts.add(tx.ready()); } try { return Futures.immediateCheckedFuture(new CommitCoordinationTask(this, cohorts, null).call()); - } catch (TransactionCommitFailedException e) { + } catch (final TransactionCommitFailedException e) { return Futures.immediateFailedCheckedFuture(e); } } @@ -105,7 +104,7 @@ final class ShardedDOMDataWriteTransaction implements DOMDataWriteTransaction { @Override @Deprecated public ListenableFuture> commit() { - return AbstractDataTransaction.convertToLegacyCommitFuture(submit()); + return CommitCompatibility.convertToLegacyCommitFuture(submit()); } @Override diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/ShardingTableEntry.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/ShardingTableEntry.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/ShardingTableEntry.java rename to dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/ShardingTableEntry.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/TransactionCommitFailedExceptionMapper.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/TransactionCommitFailedExceptionMapper.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/TransactionCommitFailedExceptionMapper.java rename to dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/TransactionCommitFailedExceptionMapper.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/UnknownDOMRpcRoutingTableEntry.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/UnknownDOMRpcRoutingTableEntry.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/UnknownDOMRpcRoutingTableEntry.java rename to dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/UnknownDOMRpcRoutingTableEntry.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/mount/DOMMountPointServiceImpl.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/mount/DOMMountPointServiceImpl.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/mount/DOMMountPointServiceImpl.java rename to dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/mount/DOMMountPointServiceImpl.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/BrokerImpl.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/BrokerImpl.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/BrokerImpl.java rename to dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/BrokerImpl.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/ConsumerContextImpl.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/ConsumerContextImpl.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/ConsumerContextImpl.java rename to dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/ConsumerContextImpl.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/GlobalBundleScanningSchemaServiceImpl.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/GlobalBundleScanningSchemaServiceImpl.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/GlobalBundleScanningSchemaServiceImpl.java rename to dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/GlobalBundleScanningSchemaServiceImpl.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/ProviderContextImpl.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/ProviderContextImpl.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/ProviderContextImpl.java rename to dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/ProviderContextImpl.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/SchemaContextProviders.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/SchemaContextProviders.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/SchemaContextProviders.java rename to dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/SchemaContextProviders.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/AbstractBrokerServiceProxy.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/AbstractBrokerServiceProxy.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/AbstractBrokerServiceProxy.java rename to dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/AbstractBrokerServiceProxy.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/DOMDataBrokerProxy.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/DOMDataBrokerProxy.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/DOMDataBrokerProxy.java rename to dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/DOMDataBrokerProxy.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/DOMMountPointServiceProxy.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/DOMMountPointServiceProxy.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/DOMMountPointServiceProxy.java rename to dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/DOMMountPointServiceProxy.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/ProxyFactory.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/ProxyFactory.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/ProxyFactory.java rename to dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/ProxyFactory.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/SchemaServiceActivator.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/SchemaServiceActivator.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/SchemaServiceActivator.java rename to dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/SchemaServiceActivator.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/SchemaServiceProxy.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/SchemaServiceProxy.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/SchemaServiceProxy.java rename to dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/SchemaServiceProxy.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/package-info.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/package-info.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/package-info.java rename to dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/package-info.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/util/ProxySchemaContext.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/util/ProxySchemaContext.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/util/ProxySchemaContext.java rename to dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/util/ProxySchemaContext.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/util/YangSchemaUtils.java b/dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/util/YangSchemaUtils.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/util/YangSchemaUtils.java rename to dom/mdsal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/util/YangSchemaUtils.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/BlockingTransactionChainListener.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/BlockingTransactionChainListener.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/BlockingTransactionChainListener.java rename to dom/mdsal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/BlockingTransactionChainListener.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMBrokerPerformanceTest.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMBrokerPerformanceTest.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMBrokerPerformanceTest.java rename to dom/mdsal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMBrokerPerformanceTest.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMBrokerTest.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMBrokerTest.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMBrokerTest.java rename to dom/mdsal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMBrokerTest.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMDataTreeListenerTest.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMDataTreeListenerTest.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMDataTreeListenerTest.java rename to dom/mdsal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMDataTreeListenerTest.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMTransactionChainTest.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMTransactionChainTest.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMTransactionChainTest.java rename to dom/mdsal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMTransactionChainTest.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/MountPointServiceTest.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/MountPointServiceTest.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/MountPointServiceTest.java rename to dom/mdsal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/MountPointServiceTest.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/TestModel.java b/dom/mdsal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/TestModel.java similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/TestModel.java rename to dom/mdsal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/TestModel.java diff --git a/opendaylight/md-sal/sal-dom-broker/src/test/resources/odl-datastore-test.yang b/dom/mdsal-dom-broker/src/test/resources/odl-datastore-test.yang similarity index 100% rename from opendaylight/md-sal/sal-dom-broker/src/test/resources/odl-datastore-test.yang rename to dom/mdsal-dom-broker/src/test/resources/odl-datastore-test.yang diff --git a/opendaylight/md-sal/sal-inmemory-datastore/pom.xml b/dom/mdsal-dom-inmemory-datastore/pom.xml similarity index 54% rename from opendaylight/md-sal/sal-inmemory-datastore/pom.xml rename to dom/mdsal-dom-inmemory-datastore/pom.xml index a1ba2ecdd6..efeeadacc5 100644 --- a/opendaylight/md-sal/sal-inmemory-datastore/pom.xml +++ b/dom/mdsal-dom-inmemory-datastore/pom.xml @@ -2,12 +2,12 @@ 4.0.0 - org.opendaylight.controller - sal-parent - 1.3.0-SNAPSHOT + org.opendaylight.mdsal + mdsal-dom + 2.0.0-SNAPSHOT - sal-inmemory-datastore + mdsal-dom-inmemory-datastore bundle @@ -17,57 +17,30 @@ guava - - - - org.opendaylight.controller - config-api - - - - org.opendaylight.controller - sal-binding-api - - - org.opendaylight.controller - sal-common-api + org.opendaylight.mdsal + mdsal-common-api - - org.opendaylight.controller - sal-common-util + org.opendaylight.mdsal + mdsal-dom-api - - org.opendaylight.controller - sal-core-api + org.opendaylight.mdsal + mdsal-dom-spi - - org.opendaylight.controller - sal-core-spi - - org.opendaylight.yangtools concepts - org.opendaylight.yangtools util - - - org.opendaylight.yangtools - yang-binding - - org.opendaylight.yangtools yang-common - org.opendaylight.yangtools yang-data-api @@ -80,12 +53,6 @@ org.opendaylight.yangtools yang-parser-impl - - - org.opendaylight.controller - sal-dom-config - - org.osgi org.osgi.core @@ -107,21 +74,11 @@ slf4j-simple test - - org.opendaylight.yangtools - binding-generator-impl - test - org.opendaylight.yangtools mockito-configuration test - - org.opendaylight.controller - sal-test-model - test - @@ -134,7 +91,7 @@ ${project.groupId}.${project.artifactId} - org.opendaylight.controller.md.sal.dom.store.impl.* + org.opendaylight.mdsal.md.sal.dom.store.impl.* * @@ -145,7 +102,7 @@ jacoco-maven-plugin - org.opendaylight.controller.* + org.opendaylight.mdsal.* false @@ -165,34 +122,6 @@ - - org.opendaylight.yangtools - yang-maven-plugin - - - config - - generate-sources - - - - - org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator - ${jmxGeneratorPath} - - urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang - - - - org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl - ${salGeneratorPath} - - - true - - - - diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/ChainedTransactionCommitImpl.java b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/ChainedTransactionCommitImpl.java similarity index 100% rename from opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/ChainedTransactionCommitImpl.java rename to dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/ChainedTransactionCommitImpl.java diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/DOMImmutableDataChangeEvent.java b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/DOMImmutableDataChangeEvent.java similarity index 100% rename from opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/DOMImmutableDataChangeEvent.java rename to dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/DOMImmutableDataChangeEvent.java diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/DOMStoreTransactionChainImpl.java b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/DOMStoreTransactionChainImpl.java similarity index 100% rename from opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/DOMStoreTransactionChainImpl.java rename to dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/DOMStoreTransactionChainImpl.java diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/DataChangeListenerRegistration.java b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/DataChangeListenerRegistration.java similarity index 100% rename from opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/DataChangeListenerRegistration.java rename to dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/DataChangeListenerRegistration.java diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMDataStore.java b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMDataStore.java similarity index 100% rename from opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMDataStore.java rename to dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMDataStore.java diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMDataStoreConfigProperties.java b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMDataStoreConfigProperties.java similarity index 100% rename from opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMDataStoreConfigProperties.java rename to dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMDataStoreConfigProperties.java diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMDataStoreFactory.java b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMDataStoreFactory.java similarity index 100% rename from opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMDataStoreFactory.java rename to dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMDataStoreFactory.java diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMStoreThreePhaseCommitCohort.java b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMStoreThreePhaseCommitCohort.java similarity index 100% rename from opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMStoreThreePhaseCommitCohort.java rename to dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMStoreThreePhaseCommitCohort.java diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMStoreTreeChangePublisher.java b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMStoreTreeChangePublisher.java similarity index 100% rename from opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMStoreTreeChangePublisher.java rename to dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDOMStoreTreeChangePublisher.java diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/ResolveDataChangeEventsTask.java b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/ResolveDataChangeEventsTask.java similarity index 100% rename from opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/ResolveDataChangeEventsTask.java rename to dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/ResolveDataChangeEventsTask.java diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/ResolveDataChangeState.java b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/ResolveDataChangeState.java similarity index 100% rename from opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/ResolveDataChangeState.java rename to dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/ResolveDataChangeState.java diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/tree/DataChangeListenerRegistrationImpl.java b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/tree/DataChangeListenerRegistrationImpl.java similarity index 100% rename from opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/tree/DataChangeListenerRegistrationImpl.java rename to dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/tree/DataChangeListenerRegistrationImpl.java diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/tree/ListenerNode.java b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/tree/ListenerNode.java similarity index 100% rename from opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/tree/ListenerNode.java rename to dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/tree/ListenerNode.java diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/tree/ListenerTree.java b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/tree/ListenerTree.java similarity index 100% rename from opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/tree/ListenerTree.java rename to dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/tree/ListenerTree.java diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/tree/ListenerWalker.java b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/tree/ListenerWalker.java similarity index 100% rename from opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/tree/ListenerWalker.java rename to dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/tree/ListenerWalker.java diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/main/yang/opendaylight-inmemory-datastore-provider.yang b/dom/mdsal-dom-inmemory-datastore/src/main/yang/opendaylight-inmemory-datastore-provider.yang similarity index 100% rename from opendaylight/md-sal/sal-inmemory-datastore/src/main/yang/opendaylight-inmemory-datastore-provider.yang rename to dom/mdsal-dom-inmemory-datastore/src/main/yang/opendaylight-inmemory-datastore-provider.yang diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/AbstractDataChangeListenerTest.java b/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/AbstractDataChangeListenerTest.java similarity index 74% rename from opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/AbstractDataChangeListenerTest.java rename to dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/AbstractDataChangeListenerTest.java index 8d32962421..bc3ef3797b 100644 --- a/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/AbstractDataChangeListenerTest.java +++ b/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/AbstractDataChangeListenerTest.java @@ -13,14 +13,7 @@ import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.opendaylight.controller.md.sal.dom.store.impl.DatastoreTestTask.WriteTransactionCustomizer; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.Top; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.TwoLevelList; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.two.level.list.TopLevelList; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.two.level.list.top.level.list.NestedList; -import org.opendaylight.yangtools.sal.binding.generator.impl.ModuleInfoBackedContext; import org.opendaylight.yangtools.util.concurrent.SpecialExecutors; -import org.opendaylight.yangtools.yang.binding.YangModuleInfo; -import org.opendaylight.yangtools.yang.binding.util.BindingReflections; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; @@ -39,8 +32,8 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext; public abstract class AbstractDataChangeListenerTest { protected static final YangInstanceIdentifier TOP_LEVEL = YangInstanceIdentifier - .of(Top.QNAME); - private static final QName NAME_QNAME = QName.create(Top.QNAME, "name"); +.of(TestModel.TEST_QNAME); + private static final QName NAME_QNAME = TestModel.ID_QNAME; protected static final String FOO = "foo"; protected static final String BAR = "bar"; protected static final String BAZ = "baz"; @@ -51,11 +44,7 @@ public abstract class AbstractDataChangeListenerTest { @Before public final void setup() throws Exception { - YangModuleInfo moduleInfo = BindingReflections - .getModuleInfo(TwoLevelList.class); - ModuleInfoBackedContext context = ModuleInfoBackedContext.create(); - context.registerModuleInfo(moduleInfo); - schemaContext = context.tryToCreateSchemaContext().get(); + schemaContext = TestModel.createTestContext(); dclExecutorService = new TestDCLExecutorService( SpecialExecutors.newBlockingBoundedFastThreadPool(1, 10, "DCL" )); @@ -86,20 +75,20 @@ public abstract class AbstractDataChangeListenerTest { public static final YangInstanceIdentifier path(final String topName, final String nestedName) { - return path(topName).node(NestedList.QNAME).node( - new NodeIdentifierWithPredicates(NestedList.QNAME, NAME_QNAME, + return path(topName).node(TestModel.INNER_LIST_QNAME).node( + new NodeIdentifierWithPredicates(TestModel.INNER_LIST_QNAME, NAME_QNAME, nestedName)); } public static final YangInstanceIdentifier path(final String topName) { - return TOP_LEVEL.node(TopLevelList.QNAME).node( - new NodeIdentifierWithPredicates(TopLevelList.QNAME, + return TOP_LEVEL.node(TestModel.OUTER_LIST_QNAME).node( + new NodeIdentifierWithPredicates(TestModel.OUTER_LIST_QNAME, NAME_QNAME, topName)); } protected static DataContainerNodeAttrBuilder top() { return Builders.containerBuilder().withNodeIdentifier( - new NodeIdentifier(Top.QNAME)); +new NodeIdentifier(TestModel.TEST_QNAME)); } @@ -113,54 +102,54 @@ public abstract class AbstractDataChangeListenerTest { } protected static void assertContains(final Collection set, final K... values) { - for (K key : values) { + for (final K key : values) { Assert.assertTrue(set.contains(key)); } } protected static void assertNotContains(final Collection set, final K... values) { - for (K key : values) { + for (final K key : values) { Assert.assertFalse(set.contains(key)); } } protected static void assertContains(final Map map, final K... values) { - for (K key : values) { + for (final K key : values) { Assert.assertTrue(map.containsKey(key)); } } protected static void assertNotContains(final Map map, final K... values) { - for (K key : values) { + for (final K key : values) { Assert.assertFalse(map.containsKey(key)); } } protected static CollectionNodeBuilder topLevelMap() { - return ImmutableNodes.mapNodeBuilder(TopLevelList.QNAME); + return ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME); } protected static CollectionNodeBuilder nestedMap() { - return Builders.orderedMapBuilder().withNodeIdentifier(new NodeIdentifier(NestedList.QNAME)); + return Builders.orderedMapBuilder().withNodeIdentifier(new NodeIdentifier(TestModel.INNER_LIST_QNAME)); } public static DataContainerNodeBuilder topLevelList( final String key) { - return ImmutableNodes.mapEntryBuilder(TopLevelList.QNAME, NAME_QNAME, + return ImmutableNodes.mapEntryBuilder(TestModel.OUTER_LIST_QNAME, NAME_QNAME, key); } public static DataContainerNodeBuilder nestedList( final String key) { return ImmutableNodes - .mapEntryBuilder(NestedList.QNAME, NAME_QNAME, key); +.mapEntryBuilder(TestModel.INNER_LIST_QNAME, NAME_QNAME, key); } public static final WriteTransactionCustomizer writeOneTopMultipleNested( final String topName, final String... nestedName) { - CollectionNodeBuilder nestedMapBuilder = nestedMap(); - for (String nestedItem : nestedName) { + final CollectionNodeBuilder nestedMapBuilder = nestedMap(); + for (final String nestedItem : nestedName) { nestedMapBuilder.addChild(nestedList(nestedItem).build()); } diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/DatastoreTestTask.java b/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/DatastoreTestTask.java similarity index 100% rename from opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/DatastoreTestTask.java rename to dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/DatastoreTestTask.java diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/DefaultDataChangeListenerTestSuite.java b/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/DefaultDataChangeListenerTestSuite.java similarity index 100% rename from opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/DefaultDataChangeListenerTestSuite.java rename to dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/DefaultDataChangeListenerTestSuite.java diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDataStoreTest.java b/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDataStoreTest.java similarity index 100% rename from opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDataStoreTest.java rename to dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDataStoreTest.java diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/RootScopeSubtreeTest.java b/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/RootScopeSubtreeTest.java similarity index 100% rename from opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/RootScopeSubtreeTest.java rename to dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/RootScopeSubtreeTest.java diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/SchemaUpdateForTransactionTest.java b/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/SchemaUpdateForTransactionTest.java similarity index 61% rename from opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/SchemaUpdateForTransactionTest.java rename to dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/SchemaUpdateForTransactionTest.java index e7af4dffae..3f8da0ca0b 100644 --- a/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/SchemaUpdateForTransactionTest.java +++ b/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/SchemaUpdateForTransactionTest.java @@ -8,47 +8,42 @@ package org.opendaylight.controller.md.sal.dom.store.impl; import static org.junit.Assert.assertNotNull; -import com.google.common.base.Throwables; + import com.google.common.util.concurrent.MoreExecutors; import java.util.concurrent.ExecutionException; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadWriteTransaction; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.bi.ba.rpcservice.rev140701.RockTheHouseInput; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.Top; -import org.opendaylight.yangtools.sal.binding.generator.impl.ModuleInfoBackedContext; -import org.opendaylight.yangtools.yang.binding.YangModuleInfo; -import org.opendaylight.yangtools.yang.binding.util.BindingReflections; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; -import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import org.opendaylight.yangtools.yang.model.api.SchemaContext; public class SchemaUpdateForTransactionTest { - private static final YangInstanceIdentifier TOP_PATH = YangInstanceIdentifier.of(Top.QNAME); + private static final YangInstanceIdentifier TOP_PATH = YangInstanceIdentifier.of(TestModel.TEST_QNAME); private SchemaContext schemaContext; private InMemoryDOMDataStore domStore; @Before public void setupStore() { domStore = new InMemoryDOMDataStore("TEST", MoreExecutors.newDirectExecutorService()); - loadSchemas(RockTheHouseInput.class); + // loadSchemas(RockTheHouseInput.class); } public void loadSchemas(final Class... classes) { - YangModuleInfo moduleInfo; - try { - ModuleInfoBackedContext context = ModuleInfoBackedContext.create(); - for (Class clz : classes) { - moduleInfo = BindingReflections.getModuleInfo(clz); - - context.registerModuleInfo(moduleInfo); - } - schemaContext = context.tryToCreateSchemaContext().get(); - domStore.onGlobalContextUpdated(schemaContext); - } catch (Exception e) { - Throwables.propagateIfPossible(e); - } + // YangModuleInfo moduleInfo; + // try { + // ModuleInfoBackedContext context = ModuleInfoBackedContext.create(); + // for (Class clz : classes) { + // moduleInfo = BindingReflections.getModuleInfo(clz); + // + // context.registerModuleInfo(moduleInfo); + // } + // schemaContext = context.tryToCreateSchemaContext().get(); + // domStore.onGlobalContextUpdated(schemaContext); + // } catch (Exception e) { + // Throwables.propagateIfPossible(e); + // } } /** @@ -65,18 +60,19 @@ public class SchemaUpdateForTransactionTest { * @throws InterruptedException * @throws ExecutionException */ + @Ignore @Test public void testTransactionSchemaUpdate() throws InterruptedException, ExecutionException { - + // FIXME: Rewrite this test to be pure DOM only. assertNotNull(domStore); // We allocate transaction, initial schema context does not // contain Lists model - DOMStoreReadWriteTransaction writeTx = domStore.newReadWriteTransaction(); + final DOMStoreReadWriteTransaction writeTx = domStore.newReadWriteTransaction(); assertNotNull(writeTx); // we trigger schema context update to contain Lists model - loadSchemas(RockTheHouseInput.class, Top.class); + // loadSchemas(RockTheHouseInput.class, Top.class); /** * @@ -85,7 +81,7 @@ public class SchemaUpdateForTransactionTest { * schema context. * */ - writeTx.write(TOP_PATH, ImmutableNodes.containerNode(Top.QNAME)); + // writeTx.write(TOP_PATH, ImmutableNodes.containerNode(Top.QNAME)); } diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/TestDCLExecutorService.java b/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/TestDCLExecutorService.java similarity index 100% rename from opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/TestDCLExecutorService.java rename to dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/TestDCLExecutorService.java diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/TestModel.java b/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/TestModel.java similarity index 100% rename from opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/TestModel.java rename to dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/TestModel.java diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/WildcardedScopeBaseTest.java b/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/WildcardedScopeBaseTest.java similarity index 88% rename from opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/WildcardedScopeBaseTest.java rename to dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/WildcardedScopeBaseTest.java index ddbba76ae0..a642a7968f 100644 --- a/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/WildcardedScopeBaseTest.java +++ b/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/WildcardedScopeBaseTest.java @@ -13,14 +13,13 @@ import static org.junit.Assert.assertNotNull; import java.util.concurrent.ExecutionException; import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope; import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.two.level.list.TopLevelList; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; public class WildcardedScopeBaseTest extends DefaultDataChangeListenerTestSuite { - private static final YangInstanceIdentifier TOP_LEVEL_LIST_ALL = TOP_LEVEL.node(TopLevelList.QNAME).node( - TopLevelList.QNAME); + private static final YangInstanceIdentifier TOP_LEVEL_LIST_ALL = TOP_LEVEL.node(TestModel.OUTER_LIST_QNAME).node( + TestModel.OUTER_LIST_QNAME); @Override protected void customizeTask(final DatastoreTestTask task) { @@ -30,7 +29,7 @@ public class WildcardedScopeBaseTest extends DefaultDataChangeListenerTestSuite @Override public void putTopLevelOneNested(final DatastoreTestTask task) throws InterruptedException, ExecutionException { - AsyncDataChangeEvent> change = task.getChangeEvent(); + final AsyncDataChangeEvent> change = task.getChangeEvent(); assertNotNull(change); @@ -49,7 +48,7 @@ public class WildcardedScopeBaseTest extends DefaultDataChangeListenerTestSuite public void replaceTopLevelNestedChanged(final DatastoreTestTask task) throws InterruptedException, ExecutionException { - AsyncDataChangeEvent> change = task.getChangeEvent(); + final AsyncDataChangeEvent> change = task.getChangeEvent(); assertNotNull(change); /* * Created data must NOT contain nested-list item since scope is base, and change is two @@ -70,7 +69,7 @@ public class WildcardedScopeBaseTest extends DefaultDataChangeListenerTestSuite protected void putTopLevelWithTwoNested(final DatastoreTestTask task) throws InterruptedException, ExecutionException { - AsyncDataChangeEvent> change = task.getChangeEvent(); + final AsyncDataChangeEvent> change = task.getChangeEvent(); assertNotNull(change); assertFalse(change.getCreatedData().isEmpty()); @@ -100,7 +99,7 @@ public class WildcardedScopeBaseTest extends DefaultDataChangeListenerTestSuite public void nestedListExistsRootDeleted(final DatastoreTestTask task) throws InterruptedException, ExecutionException { - AsyncDataChangeEvent> change = task.getChangeEvent(); + final AsyncDataChangeEvent> change = task.getChangeEvent(); assertEmpty(change.getCreatedData()); assertEmpty(change.getUpdatedData()); @@ -142,7 +141,7 @@ public class WildcardedScopeBaseTest extends DefaultDataChangeListenerTestSuite @Override protected void existingTopWriteSibling(final DatastoreTestTask task) throws InterruptedException, ExecutionException { - AsyncDataChangeEvent> change = task.getChangeEvent(); + final AsyncDataChangeEvent> change = task.getChangeEvent(); assertContains(change.getCreatedData(), path(FOO_SIBLING)); assertNotContains(change.getUpdatedData(), path(FOO), TOP_LEVEL); diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/WildcardedScopeOneTest.java b/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/WildcardedScopeOneTest.java similarity index 81% rename from opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/WildcardedScopeOneTest.java rename to dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/WildcardedScopeOneTest.java index 75f9fce612..5c18bfb687 100644 --- a/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/WildcardedScopeOneTest.java +++ b/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/WildcardedScopeOneTest.java @@ -13,15 +13,13 @@ import static org.junit.Assert.assertNotNull; import java.util.concurrent.ExecutionException; import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope; import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.two.level.list.TopLevelList; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.two.level.list.top.level.list.NestedList; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; public class WildcardedScopeOneTest extends DefaultDataChangeListenerTestSuite { - private static final YangInstanceIdentifier TOP_LEVEL_LIST_ALL = TOP_LEVEL.node(TopLevelList.QNAME).node( - TopLevelList.QNAME); + private static final YangInstanceIdentifier TOP_LEVEL_LIST_ALL = TOP_LEVEL.node(TestModel.OUTER_LIST_QNAME).node( + TestModel.OUTER_LIST_QNAME); @Override protected void customizeTask(final DatastoreTestTask task) { @@ -31,12 +29,12 @@ public class WildcardedScopeOneTest extends DefaultDataChangeListenerTestSuite { @Override public void putTopLevelOneNested(final DatastoreTestTask task) throws InterruptedException, ExecutionException { - AsyncDataChangeEvent> change = task.getChangeEvent(); + final AsyncDataChangeEvent> change = task.getChangeEvent(); assertNotNull(change); assertNotContains(change.getCreatedData(), TOP_LEVEL,path(FOO, BAR)); - assertContains(change.getCreatedData(), path(FOO), path(FOO).node(NestedList.QNAME)); + assertContains(change.getCreatedData(), path(FOO), path(FOO).node(TestModel.INNER_LIST_QNAME)); assertEmpty(change.getUpdatedData()); assertEmpty(change.getRemovedPaths()); @@ -47,14 +45,14 @@ public class WildcardedScopeOneTest extends DefaultDataChangeListenerTestSuite { public void replaceTopLevelNestedChanged(final DatastoreTestTask task) throws InterruptedException, ExecutionException { - AsyncDataChangeEvent> change = task.getChangeEvent(); + final AsyncDataChangeEvent> change = task.getChangeEvent(); assertNotNull(change); /* * Created data must NOT contain nested-list item since scope is base, and change is two * level deep. */ assertNotContains(change.getCreatedData(), path(FOO, BAZ)); - assertContains(change.getUpdatedData(), path(FOO),path(FOO).node(NestedList.QNAME)); + assertContains(change.getUpdatedData(), path(FOO), path(FOO).node(TestModel.INNER_LIST_QNAME)); assertNotContains(change.getUpdatedData(), TOP_LEVEL); /* * Removed data must NOT contain nested-list item since scope is base, and change is two @@ -68,12 +66,12 @@ public class WildcardedScopeOneTest extends DefaultDataChangeListenerTestSuite { protected void putTopLevelWithTwoNested(final DatastoreTestTask task) throws InterruptedException, ExecutionException { - AsyncDataChangeEvent> change = task.getChangeEvent(); + final AsyncDataChangeEvent> change = task.getChangeEvent(); assertNotNull(change); assertFalse(change.getCreatedData().isEmpty()); // Base event should contain only changed item, and details about immediate child. - assertContains(change.getCreatedData(), path(FOO),path(FOO).node(NestedList.QNAME)); + assertContains(change.getCreatedData(), path(FOO), path(FOO).node(TestModel.INNER_LIST_QNAME)); assertNotContains(change.getCreatedData(), TOP_LEVEL,path(FOO, BAR), path(FOO, BAZ)); assertEmpty(change.getUpdatedData()); assertEmpty(change.getRemovedPaths()); @@ -99,13 +97,13 @@ public class WildcardedScopeOneTest extends DefaultDataChangeListenerTestSuite { public void nestedListExistsRootDeleted(final DatastoreTestTask task) throws InterruptedException, ExecutionException { - AsyncDataChangeEvent> change = task.getChangeEvent(); + final AsyncDataChangeEvent> change = task.getChangeEvent(); assertEmpty(change.getCreatedData()); assertEmpty(change.getUpdatedData()); assertNotContains(change.getUpdatedData(), TOP_LEVEL); - assertContains(change.getRemovedPaths(), path(FOO),path(FOO).node(NestedList.QNAME)); + assertContains(change.getRemovedPaths(), path(FOO), path(FOO).node(TestModel.INNER_LIST_QNAME)); assertNotContains(change.getRemovedPaths(), path(FOO, BAZ),path(FOO,BAR)); } @@ -137,7 +135,7 @@ public class WildcardedScopeOneTest extends DefaultDataChangeListenerTestSuite { @Override protected void existingTopWriteSibling(final DatastoreTestTask task) throws InterruptedException, ExecutionException { - AsyncDataChangeEvent> change = task.getChangeEvent(); + final AsyncDataChangeEvent> change = task.getChangeEvent(); assertContains(change.getCreatedData(), path(FOO_SIBLING)); assertNotContains(change.getUpdatedData(),path(FOO), TOP_LEVEL); diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/WildcardedScopeSubtreeTest.java b/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/WildcardedScopeSubtreeTest.java similarity index 80% rename from opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/WildcardedScopeSubtreeTest.java rename to dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/WildcardedScopeSubtreeTest.java index a7fa24f293..6055d77872 100644 --- a/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/WildcardedScopeSubtreeTest.java +++ b/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/WildcardedScopeSubtreeTest.java @@ -12,17 +12,15 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.util.concurrent.ExecutionException; - import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope; import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.two.level.list.TopLevelList; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; public class WildcardedScopeSubtreeTest extends DefaultDataChangeListenerTestSuite { - private static final YangInstanceIdentifier TOP_LEVEL_LIST_ALL = TOP_LEVEL.node(TopLevelList.QNAME).node( - TopLevelList.QNAME); + private static final YangInstanceIdentifier TOP_LEVEL_LIST_ALL = TOP_LEVEL.node(TestModel.OUTER_LIST_QNAME).node( + TestModel.OUTER_LIST_QNAME); @Override protected void customizeTask(final DatastoreTestTask task) { @@ -32,7 +30,7 @@ public class WildcardedScopeSubtreeTest extends DefaultDataChangeListenerTestSui @Override public void putTopLevelOneNested(final DatastoreTestTask task) throws InterruptedException, ExecutionException { - AsyncDataChangeEvent> change = task.getChangeEvent(); + final AsyncDataChangeEvent> change = task.getChangeEvent(); assertNotContains(change.getCreatedData(), TOP_LEVEL); assertContains(change.getCreatedData(), path(FOO), path(FOO, BAR)); @@ -45,7 +43,7 @@ public class WildcardedScopeSubtreeTest extends DefaultDataChangeListenerTestSui public void replaceTopLevelNestedChanged(final DatastoreTestTask task) throws InterruptedException, ExecutionException { - AsyncDataChangeEvent> change = task.getChangeEvent(); + final AsyncDataChangeEvent> change = task.getChangeEvent(); assertNotNull(change); assertContains(change.getCreatedData(), path(FOO, BAZ)); @@ -59,7 +57,7 @@ public class WildcardedScopeSubtreeTest extends DefaultDataChangeListenerTestSui protected void putTopLevelWithTwoNested(final DatastoreTestTask task) throws InterruptedException, ExecutionException { - AsyncDataChangeEvent> change = task.getChangeEvent(); + final AsyncDataChangeEvent> change = task.getChangeEvent(); assertNotNull(change); assertFalse(change.getCreatedData().isEmpty()); @@ -74,7 +72,7 @@ public class WildcardedScopeSubtreeTest extends DefaultDataChangeListenerTestSui protected void twoNestedExistsOneIsDeleted(final DatastoreTestTask task) throws InterruptedException, ExecutionException { - AsyncDataChangeEvent> change = task.getChangeEvent(); + final AsyncDataChangeEvent> change = task.getChangeEvent(); assertNotNull(change); assertTrue(change.getCreatedData().isEmpty()); assertContains(change.getUpdatedData(), path(FOO)); @@ -86,7 +84,7 @@ public class WildcardedScopeSubtreeTest extends DefaultDataChangeListenerTestSui public void nestedListExistsRootDeleted(final DatastoreTestTask task) throws InterruptedException, ExecutionException { - AsyncDataChangeEvent> change = task.getChangeEvent(); + final AsyncDataChangeEvent> change = task.getChangeEvent(); assertEmpty(change.getCreatedData()); assertEmpty(change.getUpdatedData()); @@ -97,7 +95,7 @@ public class WildcardedScopeSubtreeTest extends DefaultDataChangeListenerTestSui @Override protected void existingOneNestedWriteAdditionalNested(final DatastoreTestTask task) throws InterruptedException, ExecutionException { - AsyncDataChangeEvent> change = task.getChangeEvent(); + final AsyncDataChangeEvent> change = task.getChangeEvent(); assertContains(change.getCreatedData(), path(FOO,BAZ)); assertNotContains(change.getCreatedData(), path(FOO,BAR)); @@ -108,7 +106,7 @@ public class WildcardedScopeSubtreeTest extends DefaultDataChangeListenerTestSui @Override protected void existingTopWriteTwoNested(final DatastoreTestTask task) throws InterruptedException, ExecutionException { - AsyncDataChangeEvent> change = task.getChangeEvent(); + final AsyncDataChangeEvent> change = task.getChangeEvent(); assertContains(change.getCreatedData(), path(FOO,BAR),path(FOO,BAZ)); assertContains(change.getUpdatedData(), path(FOO)); @@ -118,7 +116,7 @@ public class WildcardedScopeSubtreeTest extends DefaultDataChangeListenerTestSui @Override protected void existingTopWriteSibling(final DatastoreTestTask task) throws InterruptedException, ExecutionException { - AsyncDataChangeEvent> change = task.getChangeEvent(); + final AsyncDataChangeEvent> change = task.getChangeEvent(); assertContains(change.getCreatedData(), path(FOO_SIBLING)); assertNotContains(change.getUpdatedData(), path(FOO), TOP_LEVEL); diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/test/resources/odl-datastore-test.yang b/dom/mdsal-dom-inmemory-datastore/src/test/resources/odl-datastore-test.yang similarity index 96% rename from opendaylight/md-sal/sal-inmemory-datastore/src/test/resources/odl-datastore-test.yang rename to dom/mdsal-dom-inmemory-datastore/src/test/resources/odl-datastore-test.yang index 17541fecab..6c64032b75 100644 --- a/opendaylight/md-sal/sal-inmemory-datastore/src/test/resources/odl-datastore-test.yang +++ b/dom/mdsal-dom-inmemory-datastore/src/test/resources/odl-datastore-test.yang @@ -29,6 +29,7 @@ module odl-datastore-test { } } list inner-list { + ordered-by user; key name; leaf name { type string; diff --git a/dom/mdsal-dom-spi/pom.xml b/dom/mdsal-dom-spi/pom.xml new file mode 100644 index 0000000000..ba7ae2d2fd --- /dev/null +++ b/dom/mdsal-dom-spi/pom.xml @@ -0,0 +1,25 @@ + + + 4.0.0 + + org.opendaylight.mdsal + mdsal-dom + 2.0.0-SNAPSHOT + + mdsal-dom-spi + bundle + + + + org.opendaylight.mdsal + mdsal-dom-api + + + + + scm:git:http://git.opendaylight.org/gerrit/mdsal.git + scm:git:ssh://git.opendaylight.org:29418/mdsal.git + HEAD + https://wiki.opendaylight.org/view/MD-SAL:Main + + diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/broker/spi/mount/SimpleDOMMountPoint.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/broker/spi/mount/SimpleDOMMountPoint.java similarity index 100% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/broker/spi/mount/SimpleDOMMountPoint.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/broker/spi/mount/SimpleDOMMountPoint.java diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/broker/spi/rpc/RpcRoutingStrategy.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/broker/spi/rpc/RpcRoutingStrategy.java similarity index 100% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/broker/spi/rpc/RpcRoutingStrategy.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/broker/spi/rpc/RpcRoutingStrategy.java diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/AbstractDOMDataTreeChangeListenerRegistration.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/AbstractDOMDataTreeChangeListenerRegistration.java similarity index 100% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/AbstractDOMDataTreeChangeListenerRegistration.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/AbstractDOMDataTreeChangeListenerRegistration.java diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/AbstractDOMRpcImplementationRegistration.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/AbstractDOMRpcImplementationRegistration.java similarity index 100% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/AbstractDOMRpcImplementationRegistration.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/AbstractDOMRpcImplementationRegistration.java diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/AbstractDOMRpcProviderService.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/AbstractDOMRpcProviderService.java similarity index 100% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/AbstractDOMRpcProviderService.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/AbstractDOMRpcProviderService.java diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/AbstractRegistrationTree.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/AbstractRegistrationTree.java similarity index 100% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/AbstractRegistrationTree.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/AbstractRegistrationTree.java diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/DOMNotificationSubscriptionListener.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/DOMNotificationSubscriptionListener.java similarity index 100% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/DOMNotificationSubscriptionListener.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/DOMNotificationSubscriptionListener.java diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/DOMNotificationSubscriptionListenerRegistry.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/DOMNotificationSubscriptionListenerRegistry.java similarity index 100% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/DOMNotificationSubscriptionListenerRegistry.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/DOMNotificationSubscriptionListenerRegistry.java diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/DefaultDOMRpcResult.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/DefaultDOMRpcResult.java similarity index 100% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/DefaultDOMRpcResult.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/DefaultDOMRpcResult.java diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMDataBroker.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMDataBroker.java similarity index 100% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMDataBroker.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMDataBroker.java diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMDataReadOnlyTransaction.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMDataReadOnlyTransaction.java similarity index 100% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMDataReadOnlyTransaction.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMDataReadOnlyTransaction.java diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMDataReadWriteTransaction.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMDataReadWriteTransaction.java similarity index 100% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMDataReadWriteTransaction.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMDataReadWriteTransaction.java diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMDataWriteTransaction.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMDataWriteTransaction.java similarity index 100% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMDataWriteTransaction.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMDataWriteTransaction.java diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMNotificationPublishService.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMNotificationPublishService.java similarity index 100% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMNotificationPublishService.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMNotificationPublishService.java diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMNotificationService.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMNotificationService.java similarity index 100% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMNotificationService.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMNotificationService.java diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMRpcImplementation.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMRpcImplementation.java similarity index 100% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMRpcImplementation.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMRpcImplementation.java diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMRpcProviderService.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMRpcProviderService.java similarity index 100% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMRpcProviderService.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMRpcProviderService.java diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMRpcResult.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMRpcResult.java similarity index 100% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMRpcResult.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMRpcResult.java diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMRpcService.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMRpcService.java similarity index 100% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMRpcService.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMRpcService.java diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMTransactionChain.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMTransactionChain.java similarity index 100% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMTransactionChain.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/ForwardingDOMTransactionChain.java diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/RegistrationTreeNode.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/RegistrationTreeNode.java similarity index 100% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/RegistrationTreeNode.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/RegistrationTreeNode.java diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/RegistrationTreeSnapshot.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/RegistrationTreeSnapshot.java similarity index 100% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/RegistrationTreeSnapshot.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/spi/RegistrationTreeSnapshot.java diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/ForwardingConsumerSession.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/ForwardingConsumerSession.java similarity index 100% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/ForwardingConsumerSession.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/ForwardingConsumerSession.java diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/ForwardingProviderSession.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/ForwardingProviderSession.java similarity index 100% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/ForwardingProviderSession.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/ForwardingProviderSession.java diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/AbstractDOMStoreTransaction.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/AbstractDOMStoreTransaction.java similarity index 94% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/AbstractDOMStoreTransaction.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/AbstractDOMStoreTransaction.java index 106abca3ec..ec6d4a1963 100644 --- a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/AbstractDOMStoreTransaction.java +++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/AbstractDOMStoreTransaction.java @@ -17,12 +17,12 @@ import javax.annotation.Nullable; /** * Abstract DOM Store Transaction. * - * Convenience super implementation of DOM Store transaction which provides - * common implementation of {@link #toString()} and {@link #getIdentifier()}. + * Convenience super implementation of DOM Store transaction which provides common implementation of + * {@link #toString()} and {@link #getIdentifier()}. * * It can optionally capture the context where it was allocated. * - * identifier type + * @param identifier type */ @Beta public abstract class AbstractDOMStoreTransaction implements DOMStoreTransaction { diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/AbstractDOMStoreTreeChangePublisher.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/AbstractDOMStoreTreeChangePublisher.java similarity index 100% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/AbstractDOMStoreTreeChangePublisher.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/AbstractDOMStoreTreeChangePublisher.java diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/AbstractSnapshotBackedTransactionChain.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/AbstractSnapshotBackedTransactionChain.java similarity index 100% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/AbstractSnapshotBackedTransactionChain.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/AbstractSnapshotBackedTransactionChain.java diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStore.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStore.java similarity index 81% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStore.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStore.java index 0bab570bd1..6c8cc0a930 100644 --- a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStore.java +++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStore.java @@ -29,23 +29,19 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; public interface DOMStore extends DOMStoreTransactionFactory { /** - * Registers {@link org.opendaylight.controller.md.sal.common.api.data.DataChangeListener} for Data Change callbacks which will - * be triggered on the change of provided subpath. What constitutes a change - * depends on the @scope parameter. + * Registers {@link AsyncDataChangeListener} for Data Change callbacks which will be triggered + * on the change of provided subpath. What constitutes a change depends on the @scope parameter. * * Listener upon registration receives an initial callback * {@link AsyncDataChangeListener#onDataChanged(org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent)} * which contains stable view of data tree at the time of registration. * - *  @param path Path (subtree identifier) on which client listener will be - * invoked. + *  @param path Path (subtree identifier) on which client listener will be invoked. * - * @param listener - * Instance of listener which should be invoked on - * @param scope - * Scope of change which triggers callback. - * @return Listener Registration object, which client may use to close - * registration / interest on receiving data changes. + * @param listener Instance of listener which should be invoked on + * @param scope Scope of change which triggers callback. + * @return Listener Registration object, which client may use to close registration / interest + * on receiving data changes. * */ >> ListenerRegistration registerChangeListener( diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreReadTransaction.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreReadTransaction.java similarity index 100% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreReadTransaction.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreReadTransaction.java diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreReadWriteTransaction.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreReadWriteTransaction.java similarity index 100% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreReadWriteTransaction.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreReadWriteTransaction.java diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreThreePhaseCommitCohort.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreThreePhaseCommitCohort.java similarity index 76% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreThreePhaseCommitCohort.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreThreePhaseCommitCohort.java index 986a153efb..6793afba22 100644 --- a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreThreePhaseCommitCohort.java +++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreThreePhaseCommitCohort.java @@ -10,25 +10,25 @@ package org.opendaylight.controller.sal.core.spi.data; import com.google.common.util.concurrent.ListenableFuture; /** - * Interface implemented by the {@link DOMStore} and exposed for each {@link DOMStoreWriteTransaction} - * upon its transition to Ready state. The frontend (DOMStore user) uses this interface to drive the - * commit procedure across potentially multiple DOMStores using the Three-Phase-Commit (3PC) Protocol, - * as described in {@link https://en.wikipedia.org/wiki/Three-phase_commit}. + * Interface implemented by the {@link DOMStore} and exposed for each + * {@link DOMStoreWriteTransaction} upon its transition to Ready state. The frontend (DOMStore user) + * uses this interface to drive the commit procedure across potentially multiple DOMStores using the + * Three-Phase-Commit (3PC) Protocol, as described in Three phase Commit. */ public interface DOMStoreThreePhaseCommitCohort { /** - * Sends transaction associated with this three phase commit instance to the - * participant, participant votes on the transaction, if the transaction - * should be committed or aborted. + * Sends transaction associated with this three phase commit instance to the participant, + * participant votes on the transaction, if the transaction should be committed or aborted. * - * @return ListenableFuture with vote of the participant. Vote - * {@link ListenableFuture#get()} is following: + * @return ListenableFuture with vote of the participant. Vote {@link ListenableFuture#get()} is + * following: *
      *
    • * true if transaction is approved by data store. - *
    • false if the transaction is not approved by data store and - * should be aborted. + *
    • false if the transaction is not approved by data store and should be aborted. + *
    */ ListenableFuture canCommit(); diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreTransaction.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreTransaction.java similarity index 100% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreTransaction.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreTransaction.java diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreTransactionChain.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreTransactionChain.java similarity index 100% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreTransactionChain.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreTransactionChain.java diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreTransactionFactory.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreTransactionFactory.java similarity index 100% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreTransactionFactory.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreTransactionFactory.java diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreTreeChangePublisher.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreTreeChangePublisher.java similarity index 100% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreTreeChangePublisher.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreTreeChangePublisher.java diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreWriteTransaction.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreWriteTransaction.java similarity index 65% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreWriteTransaction.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreWriteTransaction.java index 0a090520f2..0dc6695efe 100644 --- a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreWriteTransaction.java +++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/DOMStoreWriteTransaction.java @@ -13,40 +13,33 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; public interface DOMStoreWriteTransaction extends DOMStoreTransaction { /** - * Store a provided data at specified path. This acts as a add / replace - * operation, which is to say that whole subtree will be replaced by - * specified path. + * Store a provided data at specified path. This acts as a add / replace operation, which is to + * say that whole subtree will be replaced by specified path. * * If you need add or merge of current object with specified use - * {@link #merge(org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType, org.opendaylight.yangtools.concepts.Path, Object)} + * {@link #merge(YangInstanceIdentifier, NormalizedNode)} * * * @param path - * @param data - * Data object to be written + * @param data Data object to be written * - * @throws IllegalStateException - * if the client code already sealed transaction and invoked - * {@link #ready()} + * @throws IllegalStateException if the client code already sealed transaction and invoked + * {@link #ready()} */ void write(YangInstanceIdentifier path, NormalizedNode data); /** - * Store a provided data at specified path. This acts as a add / replace - * operation, which is to say that whole subtree will be replaced by - * specified path. + * Store a provided data at specified path. This acts as a add / replace operation, which is to + * say that whole subtree will be replaced by specified path. * * If you need add or merge of current object with specified use - * {@link #merge(org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType, org.opendaylight.yangtools.concepts.Path, Object)} - * + * {@link #merge(YangInstanceIdentifier, NormalizedNode)} * * @param path - * @param data - * Data object to be written + * @param data Data object to be written * - * @throws IllegalStateException - * if the client code already sealed transaction and invoked - * {@link #ready()} + * @throws IllegalStateException if the client code already sealed transaction and invoked + * {@link #ready()} */ void merge(YangInstanceIdentifier path, NormalizedNode data); diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/ForwardingDOMStoreThreePhaseCommitCohort.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/ForwardingDOMStoreThreePhaseCommitCohort.java similarity index 100% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/ForwardingDOMStoreThreePhaseCommitCohort.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/ForwardingDOMStoreThreePhaseCommitCohort.java diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedReadTransaction.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedReadTransaction.java similarity index 93% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedReadTransaction.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedReadTransaction.java index 8e5957c71a..a546020818 100644 --- a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedReadTransaction.java +++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedReadTransaction.java @@ -8,6 +8,7 @@ package org.opendaylight.controller.sal.core.spi.data; import static com.google.common.base.Preconditions.checkNotNull; + import com.google.common.annotations.Beta; import com.google.common.base.Optional; import com.google.common.base.Preconditions; @@ -24,10 +25,10 @@ import org.slf4j.LoggerFactory; * * Implementation of read-only transaction backed by {@link DataTreeSnapshot} * - * Implementation of read-only transaction backed by {@link DataTreeSnapshot} - * which delegates most of its calls to similar methods provided by underlying snapshot. + * Implementation of read-only transaction backed by {@link DataTreeSnapshot} which delegates most + * of its calls to similar methods provided by underlying snapshot. * - * identifier type + * @param identifier type */ @Beta public final class SnapshotBackedReadTransaction extends AbstractDOMStoreTransaction implements DOMStoreReadTransaction { @@ -65,7 +66,7 @@ public final class SnapshotBackedReadTransaction extends AbstractDOMStoreTran try { return Futures.immediateCheckedFuture(snapshot.readNode(path)); - } catch (Exception e) { + } catch (final Exception e) { LOG.error("Tx: {} Failed Read of {}", getIdentifier(), path, e); return Futures.immediateFailedCheckedFuture(new ReadFailedException("Read failed",e)); } @@ -78,7 +79,7 @@ public final class SnapshotBackedReadTransaction extends AbstractDOMStoreTran try { return Futures.immediateCheckedFuture(read(path).checkedGet().isPresent()); - } catch (ReadFailedException e) { + } catch (final ReadFailedException e) { return Futures.immediateFailedCheckedFuture(e); } } diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedReadWriteTransaction.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedReadWriteTransaction.java similarity index 100% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedReadWriteTransaction.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedReadWriteTransaction.java diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedTransactions.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedTransactions.java similarity index 100% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedTransactions.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedTransactions.java diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedWriteTransaction.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedWriteTransaction.java similarity index 95% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedWriteTransaction.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedWriteTransaction.java index a02d768370..06607860fc 100644 --- a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedWriteTransaction.java +++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedWriteTransaction.java @@ -8,6 +8,7 @@ package org.opendaylight.controller.sal.core.spi.data; import static com.google.common.base.Preconditions.checkState; + import com.google.common.annotations.Beta; import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Optional; @@ -61,7 +62,7 @@ public class SnapshotBackedWriteTransaction extends AbstractDOMStoreTransacti try { tree.write(path, data); // FIXME: Add checked exception - } catch (Exception e) { + } catch (final Exception e) { LOG.error("Tx: {}, failed to write {}:{} in {}", getIdentifier(), path, data, tree, e); // Rethrow original ones if they are subclasses of RuntimeException // or Error @@ -81,7 +82,7 @@ public class SnapshotBackedWriteTransaction extends AbstractDOMStoreTransacti try { tree.merge(path, data); // FIXME: Add checked exception - } catch (Exception e) { + } catch (final Exception e) { LOG.error("Tx: {}, failed to write {}:{} in {}", getIdentifier(), path, data, tree, e); // Rethrow original ones if they are subclasses of RuntimeException // or Error @@ -101,7 +102,7 @@ public class SnapshotBackedWriteTransaction extends AbstractDOMStoreTransacti try { tree.delete(path); // FIXME: Add checked exception - } catch (Exception e) { + } catch (final Exception e) { LOG.error("Tx: {}, failed to delete {} in {}", getIdentifier(), path, tree, e); // Rethrow original ones if they are subclasses of RuntimeException // or Error @@ -159,11 +160,10 @@ public class SnapshotBackedWriteTransaction extends AbstractDOMStoreTransacti } /** - * Prototype implementation of - * {@link #ready(org.opendaylight.controller.sal.core.spi.data.SnapshotBackedWriteTransaction)} + * Prototype implementation of {@link SnapshotBackedWriteTransaction#ready()} * - * This class is intended to be implemented by Transaction factories - * responsible for allocation of {@link org.opendaylight.controller.sal.core.spi.data.SnapshotBackedWriteTransaction} and + * This class is intended to be implemented by Transaction factories responsible for allocation + * of {@link org.opendaylight.controller.sal.core.spi.data.SnapshotBackedWriteTransaction} and * providing underlying logic for applying implementation. * * @param identifier type diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/package-info.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/package-info.java similarity index 100% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/package-info.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/package-info.java diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/package-info.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/package-info.java similarity index 100% rename from opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/package-info.java rename to dom/mdsal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/package-info.java diff --git a/dom/pom.xml b/dom/pom.xml new file mode 100644 index 0000000000..4f16b5a4d5 --- /dev/null +++ b/dom/pom.xml @@ -0,0 +1,31 @@ + + + + + + + org.opendaylight.mdsal + mdsal-parent + 2.0.0-SNAPSHOT + ../common/parent + + 4.0.0 + mdsal-dom + 2.0.0-SNAPSHOT + pom + ${project.artifactId} + ${project.artifactId} + + + mdsal-dom-api + mdsal-dom-spi + mdsal-dom-broker + mdsal-dom-inmemory-datastore + + diff --git a/opendaylight/md-sal/sal-test-model/pom.xml b/dom/sal-test-model/pom.xml similarity index 100% rename from opendaylight/md-sal/sal-test-model/pom.xml rename to dom/sal-test-model/pom.xml diff --git a/opendaylight/md-sal/sal-test-model/src/main/java/org/opendaylight/controller/md/sal/test/model/util/ListsBindingUtils.java b/dom/sal-test-model/src/main/java/org/opendaylight/controller/md/sal/test/model/util/ListsBindingUtils.java similarity index 100% rename from opendaylight/md-sal/sal-test-model/src/main/java/org/opendaylight/controller/md/sal/test/model/util/ListsBindingUtils.java rename to dom/sal-test-model/src/main/java/org/opendaylight/controller/md/sal/test/model/util/ListsBindingUtils.java diff --git a/opendaylight/md-sal/sal-test-model/src/main/yang/opendaylight-mdsal-augment-test.yang b/dom/sal-test-model/src/main/yang/opendaylight-mdsal-augment-test.yang similarity index 100% rename from opendaylight/md-sal/sal-test-model/src/main/yang/opendaylight-mdsal-augment-test.yang rename to dom/sal-test-model/src/main/yang/opendaylight-mdsal-augment-test.yang diff --git a/opendaylight/md-sal/sal-test-model/src/main/yang/opendaylight-mdsal-list-test.yang b/dom/sal-test-model/src/main/yang/opendaylight-mdsal-list-test.yang similarity index 100% rename from opendaylight/md-sal/sal-test-model/src/main/yang/opendaylight-mdsal-list-test.yang rename to dom/sal-test-model/src/main/yang/opendaylight-mdsal-list-test.yang diff --git a/opendaylight/md-sal/sal-test-model/src/main/yang/opendaylight-of-migration-test-model.yang b/dom/sal-test-model/src/main/yang/opendaylight-of-migration-test-model.yang similarity index 100% rename from opendaylight/md-sal/sal-test-model/src/main/yang/opendaylight-of-migration-test-model.yang rename to dom/sal-test-model/src/main/yang/opendaylight-of-migration-test-model.yang diff --git a/opendaylight/md-sal/sal-test-model/src/main/yang/opendaylight-sal-test-store.yang b/dom/sal-test-model/src/main/yang/opendaylight-sal-test-store.yang similarity index 100% rename from opendaylight/md-sal/sal-test-model/src/main/yang/opendaylight-sal-test-store.yang rename to dom/sal-test-model/src/main/yang/opendaylight-sal-test-store.yang diff --git a/opendaylight/md-sal/sal-test-model/src/main/yang/opendaylight-test-notification.yang b/dom/sal-test-model/src/main/yang/opendaylight-test-notification.yang similarity index 100% rename from opendaylight/md-sal/sal-test-model/src/main/yang/opendaylight-test-notification.yang rename to dom/sal-test-model/src/main/yang/opendaylight-test-notification.yang diff --git a/opendaylight/md-sal/sal-test-model/src/main/yang/opendaylight-test-routed-rpc.yang b/dom/sal-test-model/src/main/yang/opendaylight-test-routed-rpc.yang similarity index 100% rename from opendaylight/md-sal/sal-test-model/src/main/yang/opendaylight-test-routed-rpc.yang rename to dom/sal-test-model/src/main/yang/opendaylight-test-routed-rpc.yang diff --git a/opendaylight/md-sal/sal-test-model/src/main/yang/opendaylight-test-rpc-service.yang b/dom/sal-test-model/src/main/yang/opendaylight-test-rpc-service.yang similarity index 100% rename from opendaylight/md-sal/sal-test-model/src/main/yang/opendaylight-test-rpc-service.yang rename to dom/sal-test-model/src/main/yang/opendaylight-test-rpc-service.yang diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/AbstractConsumer.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/AbstractConsumer.java deleted file mode 100644 index 12c26a9856..0000000000 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/AbstractConsumer.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * 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.core.api; - -import java.util.Collection; -import java.util.Collections; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; -import org.osgi.util.tracker.ServiceTracker; -import org.osgi.util.tracker.ServiceTrackerCustomizer; - -public abstract class AbstractConsumer implements Consumer, BundleActivator,ServiceTrackerCustomizer { - - private BundleContext context; - private ServiceTracker tracker; - private Broker broker; - - @Override - public final void start(final BundleContext context) throws Exception { - this.context = context; - this.startImpl(context); - tracker = new ServiceTracker<>(context, Broker.class, this); - tracker.open(); - } - - - - @Override - public final void stop(final BundleContext context) throws Exception { - stopImpl(context); - broker = null; - tracker.close(); - } - - protected void startImpl(final BundleContext context) { - // NOOP - } - protected void stopImpl(final BundleContext context) { - // NOOP - } - - @Override - public Collection getConsumerFunctionality() { - return Collections.emptySet(); - } - - - @Override - public Broker addingService(final ServiceReference reference) { - if(broker == null) { - broker = context.getService(reference); - broker.registerConsumer(this, context); - return broker; - } - - return null; - } - - @Override - public void modifiedService(final ServiceReference reference, final Broker service) { - // NOOP - } - - @Override - public void removedService(final ServiceReference reference, final Broker service) { - stopImpl(context); - } -} diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/AbstractProvider.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/AbstractProvider.java deleted file mode 100644 index e300279d7b..0000000000 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/AbstractProvider.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * 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.core.api; - -import java.util.Collection; -import java.util.Collections; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; -import org.osgi.util.tracker.ServiceTracker; -import org.osgi.util.tracker.ServiceTrackerCustomizer; - -public abstract class AbstractProvider implements BundleActivator, Provider,ServiceTrackerCustomizer { - - private Broker broker; - private BundleContext context; - private ServiceTracker tracker; - - @Override - public Collection getProviderFunctionality() { - return Collections.emptySet(); - } - - @Override - public final void start(final BundleContext context) throws Exception { - this.context = context; - this.startImpl(context); - tracker = new ServiceTracker<>(context, Broker.class, this); - tracker.open(); - } - - protected void startImpl(final BundleContext context) { - // NOOP - } - protected void stopImpl(final BundleContext context) { - // NOOP - } - - @Override - public final void stop(final BundleContext context) throws Exception { - broker = null; - tracker.close(); - tracker = null; - stopImpl(context); - } - - @Override - public Broker addingService(final ServiceReference reference) { - if(broker == null) { - broker = context.getService(reference); - broker.registerProvider(this, context); - return broker; - } - - return null; - } - - @Override - public void modifiedService(final ServiceReference reference, final Broker service) { - // NOOP - } - - @Override - public void removedService(final ServiceReference reference, final Broker service) { - stopImpl(context); - } - -} diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/RpcImplementationUnavailableException.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/RpcImplementationUnavailableException.java deleted file mode 100644 index 45f13654d8..0000000000 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/RpcImplementationUnavailableException.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2014 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.core.api; - -/** - * Exception reported when no RPC implementation is found in the system. - * - * @deprecated Use {@link org.opendaylight.controller.md.sal.dom.api.DOMRpcImplementationNotAvailableException} instead. - */ -@Deprecated -public class RpcImplementationUnavailableException extends RuntimeException { - private static final long serialVersionUID = 1L; - - public RpcImplementationUnavailableException(final String message) { - super(message); - } - - public RpcImplementationUnavailableException(final String message, final Throwable cause) { - super(message, cause); - } -} diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/RpcRoutingContext.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/RpcRoutingContext.java deleted file mode 100644 index 66d290f531..0000000000 --- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/RpcRoutingContext.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (c) 2014 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.core.api; - -import java.io.Serializable; - -import org.opendaylight.yangtools.concepts.Immutable; -import org.opendaylight.yangtools.yang.common.QName; - -public class RpcRoutingContext implements Immutable, Serializable { - - /** - * - */ - private static final long serialVersionUID = -9079324728075883325L; - - private final QName context; - private final QName rpc; - - - private RpcRoutingContext(QName context, QName rpc) { - super(); - this.context = context; - this.rpc = rpc; - } - - public static final RpcRoutingContext create(QName context, QName rpc) { - return new RpcRoutingContext(context, rpc); - } - - public QName getContext() { - return context; - } - - public QName getRpc() { - return rpc; - } - - @Override - public String toString() { - return "RpcRoutingContext [context=" + context + ", rpc=" + rpc + "]"; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((context == null) ? 0 : context.hashCode()); - result = prime * result + ((rpc == null) ? 0 : rpc.hashCode()); - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - RpcRoutingContext other = (RpcRoutingContext) obj; - if (context == null) { - if (other.context != null) - return false; - } else if (!context.equals(other.context)) - return false; - if (rpc == null) { - if (other.rpc != null) - return false; - } else if (!rpc.equals(other.rpc)) - return false; - return true; - } -} diff --git a/opendaylight/md-sal/sal-dom-broker/pom.xml b/opendaylight/md-sal/sal-dom-broker/pom.xml deleted file mode 100644 index 17d45ff648..0000000000 --- a/opendaylight/md-sal/sal-dom-broker/pom.xml +++ /dev/null @@ -1,147 +0,0 @@ - - - 4.0.0 - - org.opendaylight.controller - sal-parent - 1.3.0-SNAPSHOT - - sal-broker-impl - bundle - - - - com.google.guava - guava - - - com.lmax - disruptor - - - org.opendaylight.controller - sal-common-impl - - - org.opendaylight.controller - sal-common-util - - - org.opendaylight.controller - sal-core-api - - - org.opendaylight.controller - sal-core-spi - - - org.opendaylight.controller - sal-inmemory-datastore - - - org.opendaylight.yangtools - util - - - org.opendaylight.yangtools - yang-data-impl - - - org.opendaylight.yangtools - yang-parser-impl - - - - org.opendaylight.yangtools.model - ietf-yang-types - - - - junit - junit - - - org.slf4j - slf4j-api - - - - org.opendaylight.yangtools - mockito-configuration - test - - - org.slf4j - slf4j-simple - test - - - - - - - - org.apache.felix - maven-bundle-plugin - true - - - ${project.groupId}.${project.artifactId} - org.opendaylight.controller.sal.dom.broker.osgi.SchemaServiceActivator - - - org.opendaylight.controller.sal.dom.broker, - org.opendaylight.controller.sal.dom.broker.impl, - org.opendaylight.controller.sal.dom.broker.osgi, - org.opendaylight.controller.sal.dom.broker.util, - org.opendaylight.controller.sal.dom.broker.spi, - - - org.opendaylight.controller.md.sal.dom.broker.impl, - org.opendaylight.controller.md.sal.dom.broker.impl.*, - - * - - - - - - org.opendaylight.yangtools - yang-maven-plugin - - - - generate-sources - - - - - org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator - ${jmxGeneratorPath} - - urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang - - - - org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl - ${salGeneratorPath} - - - org.opendaylight.yangtools.yang.unified.doc.generator.maven.DocumentationGeneratorImpl - target/site/models - - - true - - - - - - - - scm:git:http://git.opendaylight.org/gerrit/controller.git - scm:git:ssh://git.opendaylight.org:29418/controller.git - HEAD - https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL - - diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/jmx/CommitStatsMXBean.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/jmx/CommitStatsMXBean.java deleted file mode 100644 index 40dc30eb0e..0000000000 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/jmx/CommitStatsMXBean.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (c) 2014 Brocade Communications 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.md.sal.dom.broker.impl.jmx; - -/** - * MXBean interface for retrieving write Tx commit statistics. - * - * @author Thomas Pantelis - */ -public interface CommitStatsMXBean { - - /** - * Returns the total number of commits that have occurred. - */ - long getTotalCommits(); - - /** - * Returns a string representing the time duration of the longest commit, in the appropriate - * scaled units, along with the date/time that it occurred. - */ - String getLongestCommitTime(); - - /** - * Returns a string representing the time duration of the shortest commit, in the appropriate - * scaled units, along with the date/time that it occurred. - */ - String getShortestCommitTime(); - - /** - * Returns a string representing average commit time duration, in the appropriate - * scaled units. - */ - String getAverageCommitTime(); - - /** - * Clears the current stats to their defaults. - */ - void clearStats(); -} diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/jmx/CommitStatsMXBeanImpl.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/jmx/CommitStatsMXBeanImpl.java deleted file mode 100644 index 0d5306faf7..0000000000 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/jmx/CommitStatsMXBeanImpl.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2014 Brocade Communications 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.md.sal.dom.broker.impl.jmx; - -import javax.annotation.Nonnull; -import org.opendaylight.controller.md.sal.common.util.jmx.AbstractMXBean; -import org.opendaylight.yangtools.util.DurationStatisticsTracker; - -/** - * Implementation of the CommitStatsMXBean interface. - * - * @author Thomas Pantelis - */ -public class CommitStatsMXBeanImpl extends AbstractMXBean implements CommitStatsMXBean { - - private final DurationStatisticsTracker commitStatsTracker; - - /** - * Constructor. - * - * @param commitStatsTracker the DurationStatsTracker used to obtain the stats. - * @param mBeanType mBeanType Used as the type property in the bean's ObjectName. - */ - public CommitStatsMXBeanImpl(@Nonnull DurationStatisticsTracker commitStatsTracker, - @Nonnull String mBeanType) { - super("CommitStats", mBeanType, null); - this.commitStatsTracker = commitStatsTracker; - } - - @Override - public long getTotalCommits() { - return commitStatsTracker.getTotalDurations(); - } - - @Override - public String getLongestCommitTime() { - return commitStatsTracker.getDisplayableLongestDuration(); - } - - @Override - public String getShortestCommitTime() { - return commitStatsTracker.getDisplayableShortestDuration(); - } - - @Override - public String getAverageCommitTime() { - return commitStatsTracker.getDisplayableAverageDuration(); - } - - @Override - public void clearStats() { - commitStatsTracker.reset(); - } -} diff --git a/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/jmx/CommitStatsMXBeanImplTest.java b/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/jmx/CommitStatsMXBeanImplTest.java deleted file mode 100644 index 613b7a60ab..0000000000 --- a/opendaylight/md-sal/sal-dom-broker/src/test/java/org/opendaylight/controller/md/sal/dom/broker/impl/jmx/CommitStatsMXBeanImplTest.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) 2014 Brocade Communications 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.md.sal.dom.broker.impl.jmx; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import org.junit.Test; -import org.opendaylight.yangtools.util.DurationStatsTracker; - -/** - * Unit tests for CommitStatsMXBeanImpl. - * - * @author Thomas Pantelis - */ -public class CommitStatsMXBeanImplTest { - - @Test - public void test() { - - DurationStatsTracker commitStatsTracker = new DurationStatsTracker(); - CommitStatsMXBeanImpl bean = - new CommitStatsMXBeanImpl(commitStatsTracker, "Test"); - - commitStatsTracker.addDuration(100); - - assertEquals("getTotalCommits", 1L, bean.getTotalCommits()); - assertNotNull(bean.getLongestCommitTime()); - assertNotNull(bean.getShortestCommitTime()); - assertNotNull(bean.getAverageCommitTime()); - } -} diff --git a/opendaylight/md-sal/sal-dom-spi/pom.xml b/opendaylight/md-sal/sal-dom-spi/pom.xml deleted file mode 100644 index bd1606aa75..0000000000 --- a/opendaylight/md-sal/sal-dom-spi/pom.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - 4.0.0 - - org.opendaylight.controller - sal-parent - 1.3.0-SNAPSHOT - - sal-core-spi - bundle - - - - org.opendaylight.controller - sal-core-api - - - - - - org.opendaylight.yangtools - yang-maven-plugin - - - config - - generate-sources - - - - - org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator - ${jmxGeneratorPath} - - urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang - - - - org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl - ${salGeneratorPath} - - - true - - - - - - - - - scm:git:http://git.opendaylight.org/gerrit/controller.git - scm:git:ssh://git.opendaylight.org:29418/controller.git - HEAD - https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL - - diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/BrokerModule.java b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/BrokerModule.java deleted file mode 100644 index 99438c86b8..0000000000 --- a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/BrokerModule.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * 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.core.spi; - -import java.util.Set; - -import org.opendaylight.controller.sal.core.api.BrokerService; -import org.opendaylight.controller.sal.core.api.Broker.ConsumerSession; -import org.opendaylight.controller.sal.core.api.Consumer.ConsumerFunctionality; -import org.opendaylight.controller.sal.core.api.Provider.ProviderFunctionality; - -public interface BrokerModule { - - Set> getProvidedServices(); - - Set> getSupportedConsumerFunctionality(); - - T getServiceForSession(Class service, - ConsumerSession session); - - Set> getSupportedProviderFunctionality(); -} diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/statistics/DOMStoreStatsTracker.java b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/statistics/DOMStoreStatsTracker.java deleted file mode 100644 index 12713b2f45..0000000000 --- a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/statistics/DOMStoreStatsTracker.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2014 Brocade Communications 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.core.spi.data.statistics; - -import java.util.concurrent.ExecutorService; - -import javax.annotation.Nonnull; - -import org.opendaylight.yangtools.util.concurrent.QueuedNotificationManager; - -/** - * Interface for a class that tracks statistics for a data store. - * - * @author Thomas Pantelis - */ -public interface DOMStoreStatsTracker { - - /** - * Sets the executor used for DataChangeListener notifications. - * - * @param dclExecutor the executor - */ - void setDataChangeListenerExecutor( @Nonnull ExecutorService dclExecutor ); - - /** - * Sets the executor used internally by the data store. - * - * @param dsExecutor the executor - */ - void setDataStoreExecutor( @Nonnull ExecutorService dsExecutor ); - - /** - * Sets the QueuedNotificationManager use for DataChangeListener notifications, - * - * @param manager the manager - */ - void setNotificationManager( @Nonnull QueuedNotificationManager manager ); -} diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/config/yang/inmemory_datastore_provider/InMemoryConfigDataStoreProviderModule.java b/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/config/yang/inmemory_datastore_provider/InMemoryConfigDataStoreProviderModule.java deleted file mode 100644 index 3f26266fef..0000000000 --- a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/config/yang/inmemory_datastore_provider/InMemoryConfigDataStoreProviderModule.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.opendaylight.controller.config.yang.inmemory_datastore_provider; - -import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStore; -import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStoreConfigProperties; -import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStoreFactory; -import org.opendaylight.controller.md.sal.dom.store.impl.jmx.InMemoryDataStoreStats; - -public class InMemoryConfigDataStoreProviderModule extends org.opendaylight.controller.config.yang.inmemory_datastore_provider.AbstractInMemoryConfigDataStoreProviderModule { - - public InMemoryConfigDataStoreProviderModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier, final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { - super(identifier, dependencyResolver); - } - - public InMemoryConfigDataStoreProviderModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier, final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, final org.opendaylight.controller.config.yang.inmemory_datastore_provider.InMemoryConfigDataStoreProviderModule oldModule, final java.lang.AutoCloseable oldInstance) { - super(identifier, dependencyResolver, oldModule, oldInstance); - } - - @Override - public void customValidation() { - // add custom validation form module attributes here. - } - - @Override - public java.lang.AutoCloseable createInstance() { - InMemoryDOMDataStore dataStore = InMemoryDOMDataStoreFactory.create("DOM-CFG", getSchemaServiceDependency(), - getDebugTransactions(), - InMemoryDOMDataStoreConfigProperties.create(getMaxDataChangeExecutorPoolSize(), - getMaxDataChangeExecutorQueueSize(), getMaxDataChangeListenerQueueSize(), - getMaxDataStoreExecutorQueueSize())); - - InMemoryDataStoreStats statsBean = new InMemoryDataStoreStats("InMemoryConfigDataStore", dataStore); - dataStore.setCloseable(statsBean); - - return dataStore; - } - -} diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/config/yang/inmemory_datastore_provider/InMemoryConfigDataStoreProviderModuleFactory.java b/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/config/yang/inmemory_datastore_provider/InMemoryConfigDataStoreProviderModuleFactory.java deleted file mode 100644 index 1931c14347..0000000000 --- a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/config/yang/inmemory_datastore_provider/InMemoryConfigDataStoreProviderModuleFactory.java +++ /dev/null @@ -1,13 +0,0 @@ -/* -* Generated file -* -* Generated from: yang module name: opendaylight-inmemory-datastore-provider yang module local name: inmemory-config-datastore-provider -* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator -* Generated at: Thu Jun 19 17:10:42 PDT 2014 -* -* Do not modify this file unless it is present under src/main directory -*/ -package org.opendaylight.controller.config.yang.inmemory_datastore_provider; -public class InMemoryConfigDataStoreProviderModuleFactory extends org.opendaylight.controller.config.yang.inmemory_datastore_provider.AbstractInMemoryConfigDataStoreProviderModuleFactory { - -} diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/config/yang/inmemory_datastore_provider/InMemoryOperationalDataStoreProviderModule.java b/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/config/yang/inmemory_datastore_provider/InMemoryOperationalDataStoreProviderModule.java deleted file mode 100644 index c91c53aba4..0000000000 --- a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/config/yang/inmemory_datastore_provider/InMemoryOperationalDataStoreProviderModule.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.opendaylight.controller.config.yang.inmemory_datastore_provider; - -import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStore; -import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStoreConfigProperties; -import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStoreFactory; -import org.opendaylight.controller.md.sal.dom.store.impl.jmx.InMemoryDataStoreStats; - -public class InMemoryOperationalDataStoreProviderModule extends org.opendaylight.controller.config.yang.inmemory_datastore_provider.AbstractInMemoryOperationalDataStoreProviderModule { - - public InMemoryOperationalDataStoreProviderModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier, final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { - super(identifier, dependencyResolver); - } - - public InMemoryOperationalDataStoreProviderModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier, final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, final org.opendaylight.controller.config.yang.inmemory_datastore_provider.InMemoryOperationalDataStoreProviderModule oldModule, final java.lang.AutoCloseable oldInstance) { - super(identifier, dependencyResolver, oldModule, oldInstance); - } - - @Override - public void customValidation() { - // add custom validation form module attributes here. - } - - @Override - public java.lang.AutoCloseable createInstance() { - InMemoryDOMDataStore dataStore = InMemoryDOMDataStoreFactory.create("DOM-OPER", getSchemaServiceDependency(), - getDebugTransactions(), InMemoryDOMDataStoreConfigProperties.create(getMaxDataChangeExecutorPoolSize(), - getMaxDataChangeExecutorQueueSize(), getMaxDataChangeListenerQueueSize(), - getMaxDataStoreExecutorQueueSize())); - - - InMemoryDataStoreStats statsBean = new InMemoryDataStoreStats("InMemoryOperationalDataStore", dataStore); - - dataStore.setCloseable(statsBean); - - return dataStore; - } -} diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/config/yang/inmemory_datastore_provider/InMemoryOperationalDataStoreProviderModuleFactory.java b/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/config/yang/inmemory_datastore_provider/InMemoryOperationalDataStoreProviderModuleFactory.java deleted file mode 100644 index 49bc6a2064..0000000000 --- a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/config/yang/inmemory_datastore_provider/InMemoryOperationalDataStoreProviderModuleFactory.java +++ /dev/null @@ -1,13 +0,0 @@ -/* -* Generated file -* -* Generated from: yang module name: opendaylight-inmemory-datastore-provider yang module local name: inmemory-operational-datastore-provider -* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator -* Generated at: Thu Jun 19 17:10:42 PDT 2014 -* -* Do not modify this file unless it is present under src/main directory -*/ -package org.opendaylight.controller.config.yang.inmemory_datastore_provider; -public class InMemoryOperationalDataStoreProviderModuleFactory extends org.opendaylight.controller.config.yang.inmemory_datastore_provider.AbstractInMemoryOperationalDataStoreProviderModuleFactory { - -} diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/jmx/InMemoryDataStoreStats.java b/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/jmx/InMemoryDataStoreStats.java deleted file mode 100644 index cb91b4c81a..0000000000 --- a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/jmx/InMemoryDataStoreStats.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2014 Brocade Communications 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.md.sal.dom.store.impl.jmx; - -import org.opendaylight.controller.md.sal.common.util.jmx.AbstractMXBean; -import org.opendaylight.controller.md.sal.common.util.jmx.QueuedNotificationManagerMXBeanImpl; -import org.opendaylight.controller.md.sal.common.util.jmx.ThreadExecutorStatsMXBeanImpl; -import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStore; -import org.opendaylight.yangtools.util.concurrent.QueuedNotificationManager; - -/** - * Wrapper class for data store MXbeans. - * - * @author Thomas Pantelis - */ -public class InMemoryDataStoreStats implements AutoCloseable { - - private final AbstractMXBean notificationExecutorStatsBean; - private final QueuedNotificationManagerMXBeanImpl notificationManagerStatsBean; - - public InMemoryDataStoreStats(final String mBeanType, final QueuedNotificationManager manager) { - - notificationManagerStatsBean = new QueuedNotificationManagerMXBeanImpl(manager, - "notification-manager", mBeanType, null); - notificationManagerStatsBean.registerMBean(); - - notificationExecutorStatsBean = ThreadExecutorStatsMXBeanImpl.create(manager.getExecutor(), - "notification-executor", mBeanType, null); - if (notificationExecutorStatsBean != null) { - notificationExecutorStatsBean.registerMBean(); - } - } - - public InMemoryDataStoreStats(final String name, final InMemoryDOMDataStore dataStore) { - this(name, dataStore.getDataChangeListenerNotificationManager()); - } - - @Override - public void close() throws Exception { - if(notificationExecutorStatsBean != null) { - notificationExecutorStatsBean.unregisterMBean(); - } - - if(notificationManagerStatsBean != null) { - notificationManagerStatsBean.unregisterMBean(); - } - } -} diff --git a/pom.xml b/pom.xml index c6213aaa12..cd00276bfd 100644 --- a/pom.xml +++ b/pom.xml @@ -31,6 +31,7 @@ common + dom binding model -- 2.36.6