X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-clustering-commons%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fmessaging%2FMessageAssembler.java;h=297186d9f7c6bd9f13f8c6bea68ae33274931836;hb=refs%2Fchanges%2F11%2F80211%2F6;hp=87f0e9890ecbc71fdad7e4549899e04e28e2fd12;hpb=2d60632f7cf63712e8357a3cf3fc40d83366e5e6;p=controller.git diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/messaging/MessageAssembler.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/messaging/MessageAssembler.java index 87f0e9890e..297186d9f7 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/messaging/MessageAssembler.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/messaging/MessageAssembler.java @@ -7,12 +7,13 @@ */ package org.opendaylight.controller.cluster.messaging; +import static com.google.common.base.Preconditions.checkArgument; +import static java.util.Objects.requireNonNull; + import akka.actor.ActorRef; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Preconditions; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; -import com.google.common.cache.RemovalListener; import com.google.common.cache.RemovalNotification; import com.google.common.io.ByteSource; import java.io.IOException; @@ -20,7 +21,7 @@ import java.io.ObjectInputStream; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.function.BiConsumer; -import javax.annotation.Nonnull; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.controller.cluster.io.FileBackedOutputStreamFactory; import org.opendaylight.yangtools.concepts.Identifier; import org.slf4j.Logger; @@ -41,16 +42,15 @@ public final class MessageAssembler implements AutoCloseable { private final String logContext; MessageAssembler(final Builder builder) { - this.fileBackedStreamFactory = Preconditions.checkNotNull(builder.fileBackedStreamFactory, + this.fileBackedStreamFactory = requireNonNull(builder.fileBackedStreamFactory, "FiledBackedStreamFactory cannot be null"); - this.assembledMessageCallback = Preconditions.checkNotNull(builder.assembledMessageCallback, + this.assembledMessageCallback = requireNonNull(builder.assembledMessageCallback, "assembledMessageCallback cannot be null"); this.logContext = builder.logContext; stateCache = CacheBuilder.newBuilder() .expireAfterAccess(builder.expireStateAfterInactivityDuration, builder.expireStateAfterInactivityUnit) - .removalListener((RemovalListener) notification -> - stateRemoved(notification)).build(); + .removalListener(this::stateRemoved).build(); } /** @@ -96,7 +96,7 @@ public final class MessageAssembler implements AutoCloseable { * @param sendTo the reference of the actor to which subsequent message slices should be sent * @return true if the message was handled, false otherwise */ - public boolean handleMessage(final Object message, final @Nonnull ActorRef sendTo) { + public boolean handleMessage(final Object message, final @NonNull ActorRef sendTo) { if (message instanceof MessageSlice) { LOG.debug("{}: handleMessage: {}", logContext, message); onMessageSlice((MessageSlice) message, sendTo); @@ -231,7 +231,7 @@ public final class MessageAssembler implements AutoCloseable { * @return this Builder */ public Builder fileBackedStreamFactory(final FileBackedOutputStreamFactory newFileBackedStreamFactory) { - this.fileBackedStreamFactory = Preconditions.checkNotNull(newFileBackedStreamFactory); + this.fileBackedStreamFactory = requireNonNull(newFileBackedStreamFactory); return this; } @@ -257,7 +257,7 @@ public final class MessageAssembler implements AutoCloseable { * @return this Builder */ public Builder expireStateAfterInactivity(final long duration, final TimeUnit unit) { - Preconditions.checkArgument(duration > 0, "duration must be > 0"); + checkArgument(duration > 0, "duration must be > 0"); this.expireStateAfterInactivityDuration = duration; this.expireStateAfterInactivityUnit = unit; return this;