X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatabroker%2FAbstractDOMBroker.java;h=91fd64d366f5fd5c9658e1236eff5991d036af40;hb=7ce039b3e55d153fc75bc88198c49536ab83befc;hp=103f7a69c96c2e9cb92d407e745970fd8d7ce4de;hpb=5818886bae1176c6c1a947574c91ae200937661f;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractDOMBroker.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractDOMBroker.java index 103f7a69c9..91fd64d366 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractDOMBroker.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractDOMBroker.java @@ -5,74 +5,69 @@ * 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.cluster.databroker; import static com.google.common.base.Preconditions.checkState; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableMap.Builder; +import com.google.common.collect.ClassToInstanceMap; +import com.google.common.collect.ImmutableClassToInstanceMap; +import com.google.common.collect.ImmutableClassToInstanceMap.Builder; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.EnumMap; import java.util.Map; import java.util.concurrent.atomic.AtomicLong; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.controller.md.sal.common.api.data.TransactionChainListener; -import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker; -import org.opendaylight.controller.md.sal.dom.api.DOMDataBrokerExtension; -import org.opendaylight.controller.md.sal.dom.api.DOMDataChangeListener; -import org.opendaylight.controller.md.sal.dom.api.DOMDataTreeChangeListener; -import org.opendaylight.controller.md.sal.dom.api.DOMDataTreeChangeService; -import org.opendaylight.controller.md.sal.dom.api.DOMDataTreeCommitCohortRegistry; -import org.opendaylight.controller.md.sal.dom.api.DOMDataTreeIdentifier; -import org.opendaylight.controller.md.sal.dom.api.DOMTransactionChain; -import org.opendaylight.controller.sal.core.spi.data.DOMStore; -import org.opendaylight.controller.sal.core.spi.data.DOMStoreTransactionChain; -import org.opendaylight.controller.sal.core.spi.data.DOMStoreTreeChangePublisher; +import org.opendaylight.mdsal.common.api.LogicalDatastoreType; +import org.opendaylight.mdsal.dom.api.DOMDataBrokerExtension; +import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeListener; +import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeService; import org.opendaylight.mdsal.dom.api.DOMDataTreeCommitCohort; import org.opendaylight.mdsal.dom.api.DOMDataTreeCommitCohortRegistration; +import org.opendaylight.mdsal.dom.api.DOMDataTreeCommitCohortRegistry; +import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier; +import org.opendaylight.mdsal.dom.api.DOMTransactionChain; +import org.opendaylight.mdsal.dom.api.DOMTransactionChainListener; +import org.opendaylight.mdsal.dom.spi.PingPongMergingDOMDataBroker; +import org.opendaylight.mdsal.dom.spi.store.DOMStore; +import org.opendaylight.mdsal.dom.spi.store.DOMStoreTransactionChain; +import org.opendaylight.mdsal.dom.spi.store.DOMStoreTreeChangePublisher; import org.opendaylight.yangtools.concepts.ListenerRegistration; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -abstract class AbstractDOMBroker extends AbstractDOMTransactionFactory - implements DOMDataBroker { +public abstract class AbstractDOMBroker extends AbstractDOMTransactionFactory + implements PingPongMergingDOMDataBroker { private static final Logger LOG = LoggerFactory.getLogger(AbstractDOMBroker.class); private final AtomicLong txNum = new AtomicLong(); private final AtomicLong chainNum = new AtomicLong(); - private final Map, DOMDataBrokerExtension> extensions; + private final ClassToInstanceMap extensions; + private volatile AutoCloseable closeable; protected AbstractDOMBroker(final Map datastores) { super(datastores); - Builder, DOMDataBrokerExtension> extBuilder = ImmutableMap.builder(); + Builder extBuilder = ImmutableClassToInstanceMap.builder(); if (isSupported(datastores, DOMStoreTreeChangePublisher.class)) { extBuilder.put(DOMDataTreeChangeService.class, new DOMDataTreeChangeService() { @Override public ListenerRegistration registerDataTreeChangeListener( final DOMDataTreeIdentifier treeId, final L listener) { - DOMStore store = getTxFactories().get(treeId.getDatastoreType()); - checkState(store != null, "Requested logical data store is not available."); - + DOMStore store = getDOMStore(treeId.getDatastoreType()); return ((DOMStoreTreeChangePublisher) store).registerTreeChangeListener( treeId.getRootIdentifier(), listener); } }); } - if (isSupported(datastores, org.opendaylight.mdsal.dom.api.DOMDataTreeCommitCohortRegistry.class)) { + if (isSupported(datastores, DOMDataTreeCommitCohortRegistry.class)) { extBuilder.put(DOMDataTreeCommitCohortRegistry.class, new DOMDataTreeCommitCohortRegistry() { @Override public DOMDataTreeCommitCohortRegistration registerCommitCohort( - org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier path, T cohort) { - DOMStore store = getTxFactories().get(toLegacy(path.getDatastoreType())); - checkState(store != null, "Requested logical data store is not available."); - - return ((org.opendaylight.mdsal.dom.api.DOMDataTreeCommitCohortRegistry) store) - .registerCommitCohort(path, cohort); + final DOMDataTreeIdentifier path, final T cohort) { + DOMStore store = getDOMStore(path.getDatastoreType()); + return ((DOMDataTreeCommitCohortRegistry) store).registerCommitCohort(path, cohort); } }); } @@ -80,28 +75,9 @@ abstract class AbstractDOMBroker extends AbstractDOMTransactionFactory extensions = extBuilder.build(); } - private static LogicalDatastoreType toLegacy(org.opendaylight.mdsal.common.api.LogicalDatastoreType datastoreType) { - switch (datastoreType) { - case CONFIGURATION: - return LogicalDatastoreType.CONFIGURATION; - case OPERATIONAL: - return LogicalDatastoreType.OPERATIONAL; - default: - throw new IllegalArgumentException("Unsupported data store type: " + datastoreType); - } - } - - private boolean isSupported(Map datastores, - Class expDOMStoreInterface) { - boolean supported = true; - for (DOMStore ds : datastores.values()) { - if (!expDOMStoreInterface.isAssignableFrom(ds.getClass())) { - supported = false; - break; - } - } - - return supported; + private static boolean isSupported(final Map datastores, + final Class expDOMStoreInterface) { + return datastores.values().stream().allMatch(expDOMStoreInterface::isInstance); } public void setCloseable(final AutoCloseable closeable) { @@ -128,21 +104,12 @@ abstract class AbstractDOMBroker extends AbstractDOMTransactionFactory } @Override - public ListenerRegistration registerDataChangeListener(final LogicalDatastoreType store, - final YangInstanceIdentifier path, final DOMDataChangeListener listener, - final DataChangeScope triggeringScope) { - DOMStore potentialStore = getTxFactories().get(store); - checkState(potentialStore != null, "Requested logical data store is not available."); - return potentialStore.registerChangeListener(path, listener, triggeringScope); - } - - @Override - public Map, DOMDataBrokerExtension> getSupportedExtensions() { + public ClassToInstanceMap getExtensions() { return extensions; } @Override - public DOMTransactionChain createTransactionChain(final TransactionChainListener listener) { + public DOMTransactionChain createTransactionChain(final DOMTransactionChainListener listener) { checkNotClosed(); final Map backingChains = @@ -156,4 +123,12 @@ abstract class AbstractDOMBroker extends AbstractDOMTransactionFactory backingChains); return new DOMBrokerTransactionChain(chainId, backingChains, this, listener); } + + @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", + justification = "https://github.com/spotbugs/spotbugs/issues/811") + private DOMStore getDOMStore(final LogicalDatastoreType type) { + DOMStore store = getTxFactories().get(type); + checkState(store != null, "Requested logical data store is not available."); + return store; + } }