X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fsharding%2FShardProxyProducer.java;h=2990c62580b16d6dbdb89ba1205e645d03a83257;hp=3c8db5f23cab0730e112e6244d0c438d4db2b442;hb=da174be7e22b16d4ac80cccefdc52b209b700745;hpb=c1336f9b497bc6867536a24f629c3f0b002ccb2f diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/ShardProxyProducer.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/ShardProxyProducer.java index 3c8db5f23c..2990c62580 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/ShardProxyProducer.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/ShardProxyProducer.java @@ -5,31 +5,23 @@ * 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.sharding; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import com.google.common.collect.ImmutableList; import java.util.Collection; -import java.util.concurrent.atomic.AtomicLong; -import javax.annotation.Nonnull; import org.opendaylight.controller.cluster.databroker.actors.dds.ClientLocalHistory; import org.opendaylight.controller.cluster.databroker.actors.dds.DataStoreClient; import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier; import org.opendaylight.mdsal.dom.spi.shard.DOMDataTreeShardProducer; import org.opendaylight.mdsal.dom.spi.shard.DOMDataTreeShardWriteTransaction; -import org.opendaylight.mdsal.dom.store.inmemory.InMemoryDOMDataTreeShard; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Proxy producer implementation that creates transactions that forward all calls to {@link DataStoreClient}. */ +@Deprecated(forRemoval = true) class ShardProxyProducer implements DOMDataTreeShardProducer { - - private static final Logger LOG = LoggerFactory.getLogger(InMemoryDOMDataTreeShard.class); - private static final AtomicLong COUNTER = new AtomicLong(); - private final DOMDataTreeIdentifier shardRoot; private final Collection prefixes; private final ClientLocalHistory history; @@ -39,13 +31,12 @@ class ShardProxyProducer implements DOMDataTreeShardProducer { final Collection prefixes, final DataStoreClient client, final DistributedShardModificationFactory modificationFactory) { - this.shardRoot = Preconditions.checkNotNull(shardRoot); - this.prefixes = ImmutableList.copyOf(Preconditions.checkNotNull(prefixes)); - this.modificationFactory = Preconditions.checkNotNull(modificationFactory); - history = Preconditions.checkNotNull(client).createLocalHistory(); + this.shardRoot = requireNonNull(shardRoot); + this.prefixes = ImmutableList.copyOf(prefixes); + this.modificationFactory = requireNonNull(modificationFactory); + history = requireNonNull(client).createLocalHistory(); } - @Nonnull @Override public Collection getPrefixes() { return prefixes; @@ -62,7 +53,11 @@ class ShardProxyProducer implements DOMDataTreeShardProducer { } void setModificationFactory(final DistributedShardModificationFactory modificationFactory) { - this.modificationFactory = Preconditions.checkNotNull(modificationFactory); + this.modificationFactory = requireNonNull(modificationFactory); } -} + @Override + public void close() { + // FIXME: implement this + } +}