From: Robert Varga Date: Tue, 20 Aug 2019 19:06:59 +0000 (+0200) Subject: Fix modernization issues X-Git-Tag: release/magnesium~121 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=3859df9beca8f13f1ff2b2744ed3470a1715bec3 Fix modernization issues This fixes issues pointed out by Modernizer, which mostly boil down to using Objects.requireNonNull() and direct java.util collections. Change-Id: Id32530a6722cd101f96c23f6a745f91b2f09e2f9 Signed-off-by: Robert Varga --- diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/BlueprintContainerRestartServiceImpl.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/BlueprintContainerRestartServiceImpl.java index 2b2af15df9..0e52cb6fb2 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/BlueprintContainerRestartServiceImpl.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/BlueprintContainerRestartServiceImpl.java @@ -7,7 +7,8 @@ */ package org.opendaylight.controller.blueprint; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import com.google.common.collect.Lists; import com.google.common.util.concurrent.ThreadFactoryBuilder; import java.util.ArrayDeque; @@ -84,8 +85,8 @@ class BlueprintContainerRestartServiceImpl implements AutoCloseable, BlueprintCo } private void restartContainerAndDependentsInternal(final Bundle forBundle) { - Preconditions.checkNotNull(blueprintExtenderService); - Preconditions.checkNotNull(quiesceParticipant); + requireNonNull(blueprintExtenderService); + requireNonNull(quiesceParticipant); // We use a LinkedHashSet to preserve insertion order as we walk the service usage hierarchy. Set containerBundlesSet = new LinkedHashSet<>(); @@ -223,7 +224,7 @@ class BlueprintContainerRestartServiceImpl implements AutoCloseable, BlueprintCo } } - private ServiceRegistration registerEventHandler(final BundleContext bundleContext, + private static ServiceRegistration registerEventHandler(final BundleContext bundleContext, final BlueprintListener listener) { return bundleContext.registerService(BlueprintListener.class.getName(), listener, new Hashtable<>()); } diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/AbstractDependentComponentFactoryMetadata.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/AbstractDependentComponentFactoryMetadata.java index c47db3a24e..07bfd8fae8 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/AbstractDependentComponentFactoryMetadata.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/AbstractDependentComponentFactoryMetadata.java @@ -7,7 +7,8 @@ */ package org.opendaylight.controller.blueprint.ext; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.ArrayList; import java.util.Collections; @@ -50,7 +51,7 @@ abstract class AbstractDependentComponentFactoryMetadata implements DependentCom private boolean stoppedServiceRecipes; protected AbstractDependentComponentFactoryMetadata(final String id) { - this.id = Preconditions.checkNotNull(id); + this.id = requireNonNull(id); } @Override diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/AbstractInvokableServiceMetadata.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/AbstractInvokableServiceMetadata.java index 10ec16f1ab..873fd00abe 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/AbstractInvokableServiceMetadata.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/AbstractInvokableServiceMetadata.java @@ -7,8 +7,9 @@ */ package org.opendaylight.controller.blueprint.ext; +import static java.util.Objects.requireNonNull; + import com.google.common.base.MoreObjects; -import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; import java.util.Collection; import java.util.Set; @@ -36,7 +37,7 @@ abstract class AbstractInvokableServiceMetadata extends AbstractDependentCompone AbstractInvokableServiceMetadata(final String id, final String interfaceName) { super(id); - this.interfaceName = Preconditions.checkNotNull(interfaceName); + this.interfaceName = requireNonNull(interfaceName); } Class rpcInterface() { diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/MandatoryServiceReferenceMetadata.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/MandatoryServiceReferenceMetadata.java index 8139e1de52..eaa1ce22c5 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/MandatoryServiceReferenceMetadata.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/MandatoryServiceReferenceMetadata.java @@ -7,7 +7,8 @@ */ package org.opendaylight.controller.blueprint.ext; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import java.util.Collection; import java.util.Collections; import java.util.List; @@ -24,7 +25,7 @@ class MandatoryServiceReferenceMetadata implements ServiceReferenceMetadata { private final String id; MandatoryServiceReferenceMetadata(final String id, final String interfaceClass) { - this.id = Preconditions.checkNotNull(id); + this.id = requireNonNull(id); this.interfaceClass = interfaceClass; } diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/StaticServiceReferenceRecipe.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/StaticServiceReferenceRecipe.java index 43ad997ea4..525fc82c19 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/StaticServiceReferenceRecipe.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/StaticServiceReferenceRecipe.java @@ -7,7 +7,9 @@ */ package org.opendaylight.controller.blueprint.ext; -import com.google.common.base.Preconditions; +import static com.google.common.base.Preconditions.checkNotNull; +import static java.util.Objects.requireNonNull; + import java.util.Collections; import java.util.function.Consumer; import org.apache.aries.blueprint.container.AbstractServiceReferenceRecipe; @@ -106,15 +108,12 @@ class StaticServiceReferenceRecipe extends AbstractServiceReferenceRecipe { return trackedService; } - Preconditions.checkNotNull(localTrackedServiceReference, "trackedServiceReference is null"); - - trackedService = getServiceSecurely(localTrackedServiceReference); + trackedService = getServiceSecurely(requireNonNull(localTrackedServiceReference, + "trackedServiceReference is null")); LOG.debug("{}: Returning service instance: {}", getName(), trackedService); - Preconditions.checkNotNull(trackedService, "getService() returned null for %s", localTrackedServiceReference); - - return trackedService; + return checkNotNull(trackedService, "getService() returned null for %s", localTrackedServiceReference); } @Override diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ModifyTransactionRequestBuilder.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ModifyTransactionRequestBuilder.java index 8a04936e19..b0a0cade21 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ModifyTransactionRequestBuilder.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ModifyTransactionRequestBuilder.java @@ -7,9 +7,11 @@ */ package org.opendaylight.controller.cluster.access.commands; +import static com.google.common.base.Preconditions.checkState; +import static java.util.Objects.requireNonNull; + import akka.actor.ActorRef; import com.google.common.annotations.Beta; -import com.google.common.base.Preconditions; import java.util.ArrayList; import java.util.List; import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; @@ -35,8 +37,8 @@ public final class ModifyTransactionRequestBuilder implements Builder> data) { super(identifier, sequence); - this.data = Preconditions.checkNotNull(data); + this.data = requireNonNull(data); } public Optional> getData() { diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionDataModification.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionDataModification.java index 72520c0aec..cc901d6fee 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionDataModification.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionDataModification.java @@ -7,8 +7,9 @@ */ package org.opendaylight.controller.cluster.access.commands; +import static java.util.Objects.requireNonNull; + import com.google.common.annotations.Beta; -import com.google.common.base.Preconditions; import java.io.IOException; import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeDataOutput; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; @@ -25,7 +26,7 @@ public abstract class TransactionDataModification extends TransactionModificatio TransactionDataModification(final YangInstanceIdentifier path, final NormalizedNode data) { super(path); - this.data = Preconditions.checkNotNull(data); + this.data = requireNonNull(data); } public final NormalizedNode getData() { diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionModification.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionModification.java index dcd05c3514..e4168d5300 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionModification.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionModification.java @@ -7,9 +7,10 @@ */ package org.opendaylight.controller.cluster.access.commands; +import static java.util.Objects.requireNonNull; + import com.google.common.annotations.Beta; import com.google.common.base.MoreObjects; -import com.google.common.base.Preconditions; import java.io.IOException; import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeDataInput; import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeDataOutput; @@ -34,7 +35,7 @@ public abstract class TransactionModification { private final YangInstanceIdentifier path; TransactionModification(final YangInstanceIdentifier path) { - this.path = Preconditions.checkNotNull(path); + this.path = requireNonNull(path); } public final YangInstanceIdentifier getPath() { diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/ClientIdentifier.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/ClientIdentifier.java index fe178f26e9..e97626b7eb 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/ClientIdentifier.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/ClientIdentifier.java @@ -7,9 +7,10 @@ */ package org.opendaylight.controller.cluster.access.concepts; +import static java.util.Objects.requireNonNull; + import com.google.common.annotations.Beta; import com.google.common.base.MoreObjects; -import com.google.common.base.Preconditions; import java.io.DataInput; import java.io.DataOutput; import java.io.Externalizable; @@ -40,7 +41,7 @@ public final class ClientIdentifier implements WritableIdentifier { } Proxy(final FrontendIdentifier frontendId, final long generation) { - this.frontendId = Preconditions.checkNotNull(frontendId); + this.frontendId = requireNonNull(frontendId); this.generation = generation; } @@ -66,7 +67,7 @@ public final class ClientIdentifier implements WritableIdentifier { private final long generation; ClientIdentifier(final FrontendIdentifier frontendId, final long generation) { - this.frontendId = Preconditions.checkNotNull(frontendId); + this.frontendId = requireNonNull(frontendId); this.generation = generation; } diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/Envelope.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/Envelope.java index 02686d9708..8c5f513bbf 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/Envelope.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/Envelope.java @@ -7,8 +7,9 @@ */ package org.opendaylight.controller.cluster.access.concepts; +import static java.util.Objects.requireNonNull; + import com.google.common.base.MoreObjects; -import com.google.common.base.Preconditions; import java.io.Serializable; import org.opendaylight.yangtools.concepts.Immutable; @@ -20,7 +21,7 @@ public abstract class Envelope> implements Immutable, Se private final long sessionId; Envelope(final T message, final long sessionId, final long txSequence) { - this.message = Preconditions.checkNotNull(message); + this.message = requireNonNull(message); this.sessionId = sessionId; this.txSequence = txSequence; } diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/FrontendIdentifier.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/FrontendIdentifier.java index 60e40e9e16..d47f03773b 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/FrontendIdentifier.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/FrontendIdentifier.java @@ -7,8 +7,9 @@ */ package org.opendaylight.controller.cluster.access.concepts; +import static java.util.Objects.requireNonNull; + import com.google.common.annotations.Beta; -import com.google.common.base.Preconditions; import java.io.DataInput; import java.io.DataOutput; import java.io.Externalizable; @@ -38,8 +39,8 @@ public final class FrontendIdentifier implements WritableIdentifier { } Proxy(final MemberName memberName, final FrontendType clientType) { - this.memberName = Preconditions.checkNotNull(memberName); - this.clientType = Preconditions.checkNotNull(clientType); + this.memberName = requireNonNull(memberName); + this.clientType = requireNonNull(clientType); } @Override @@ -64,8 +65,8 @@ public final class FrontendIdentifier implements WritableIdentifier { private final FrontendType clientType; FrontendIdentifier(final MemberName memberName, final FrontendType clientType) { - this.clientType = Preconditions.checkNotNull(clientType); - this.memberName = Preconditions.checkNotNull(memberName); + this.clientType = requireNonNull(clientType); + this.memberName = requireNonNull(memberName); } public static FrontendIdentifier create(final MemberName memberName, final FrontendType clientType) { diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/LocalHistoryIdentifier.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/LocalHistoryIdentifier.java index 7346ed0f0f..f8f890e2c1 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/LocalHistoryIdentifier.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/LocalHistoryIdentifier.java @@ -7,8 +7,9 @@ */ package org.opendaylight.controller.cluster.access.concepts; +import static java.util.Objects.requireNonNull; + import com.google.common.base.MoreObjects; -import com.google.common.base.Preconditions; import java.io.DataInput; import java.io.DataOutput; import java.io.Externalizable; @@ -50,7 +51,7 @@ public final class LocalHistoryIdentifier implements WritableIdentifier { } Proxy(final ClientIdentifier frontendId, final long historyId, final long cookie) { - this.clientId = Preconditions.checkNotNull(frontendId); + this.clientId = requireNonNull(frontendId); this.historyId = historyId; this.cookie = cookie; } @@ -85,7 +86,7 @@ public final class LocalHistoryIdentifier implements WritableIdentifier { } public LocalHistoryIdentifier(final ClientIdentifier frontendId, final long historyId, final long cookie) { - this.clientId = Preconditions.checkNotNull(frontendId); + this.clientId = requireNonNull(frontendId); this.historyId = historyId; this.cookie = cookie; } diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/MemberName.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/MemberName.java index 09e39e8c58..70df622b9b 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/MemberName.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/MemberName.java @@ -7,11 +7,13 @@ */ package org.opendaylight.controller.cluster.access.concepts; +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Verify.verifyNotNull; +import static java.util.Objects.requireNonNull; + import com.google.common.annotations.Beta; import com.google.common.base.MoreObjects; -import com.google.common.base.Preconditions; import com.google.common.base.Strings; -import com.google.common.base.Verify; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.DataInput; import java.io.DataOutput; @@ -41,7 +43,7 @@ public final class MemberName implements Comparable, WritableIdentif } Proxy(final byte[] serialized) { - this.serialized = Preconditions.checkNotNull(serialized); + this.serialized = requireNonNull(serialized); } @Override @@ -70,16 +72,16 @@ public final class MemberName implements Comparable, WritableIdentif private volatile byte[] serialized; private MemberName(final String name) { - this.name = Preconditions.checkNotNull(name); + this.name = requireNonNull(name); } MemberName(final String name, final byte[] serialized) { this(name); - this.serialized = Verify.verifyNotNull(serialized); + this.serialized = verifyNotNull(serialized); } public static MemberName forName(final String name) { - Preconditions.checkArgument(!Strings.isNullOrEmpty(name)); + checkArgument(!Strings.isNullOrEmpty(name)); // TODO: consider caching instances here return new MemberName(name); } diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/RuntimeRequestException.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/RuntimeRequestException.java index a52396fd5d..7fb0ef0701 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/RuntimeRequestException.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/RuntimeRequestException.java @@ -7,8 +7,10 @@ */ package org.opendaylight.controller.cluster.access.concepts; +import static com.google.common.base.Preconditions.checkArgument; +import static java.util.Objects.requireNonNull; + import com.google.common.annotations.Beta; -import com.google.common.base.Preconditions; import com.google.common.base.Strings; /** @@ -21,8 +23,8 @@ public final class RuntimeRequestException extends RequestException { private static final long serialVersionUID = 1L; public RuntimeRequestException(final String message, final Throwable cause) { - super(message, Preconditions.checkNotNull(cause)); - Preconditions.checkArgument(!Strings.isNullOrEmpty(message), "Exception message is mandatory"); + super(message, requireNonNull(cause)); + checkArgument(!Strings.isNullOrEmpty(message), "Exception message is mandatory"); } @Override diff --git a/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/BackendInfo.java b/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/BackendInfo.java index 01aff95532..891de52fb5 100644 --- a/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/BackendInfo.java +++ b/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/BackendInfo.java @@ -7,10 +7,12 @@ */ package org.opendaylight.controller.cluster.access.client; +import static com.google.common.base.Preconditions.checkArgument; +import static java.util.Objects.requireNonNull; + import akka.actor.ActorRef; import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects.ToStringHelper; -import com.google.common.base.Preconditions; import org.opendaylight.controller.cluster.access.ABIVersion; /** @@ -33,10 +35,10 @@ public class BackendInfo { protected BackendInfo(final ActorRef actor, final String name, final long sessionId, final ABIVersion version, final int maxMessages) { - this.version = Preconditions.checkNotNull(version); - this.actor = Preconditions.checkNotNull(actor); - this.name = Preconditions.checkNotNull(name); - Preconditions.checkArgument(maxMessages > 0, "Maximum messages has to be positive, not %s", maxMessages); + this.version = requireNonNull(version); + this.actor = requireNonNull(actor); + this.name = requireNonNull(name); + checkArgument(maxMessages > 0, "Maximum messages has to be positive, not %s", maxMessages); this.maxMessages = maxMessages; this.sessionId = sessionId; } diff --git a/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/ConnectionEntry.java b/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/ConnectionEntry.java index 8d769b2738..b47ddee2a3 100644 --- a/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/ConnectionEntry.java +++ b/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/ConnectionEntry.java @@ -7,10 +7,11 @@ */ package org.opendaylight.controller.cluster.access.client; +import static java.util.Objects.requireNonNull; + import com.google.common.annotations.Beta; import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects.ToStringHelper; -import com.google.common.base.Preconditions; import java.util.function.Consumer; import org.opendaylight.controller.cluster.access.concepts.Request; import org.opendaylight.controller.cluster.access.concepts.Response; @@ -29,8 +30,8 @@ public class ConnectionEntry implements Immutable { private final long enqueuedTicks; ConnectionEntry(final Request request, final Consumer> callback, final long now) { - this.request = Preconditions.checkNotNull(request); - this.callback = Preconditions.checkNotNull(callback); + this.request = requireNonNull(request); + this.callback = requireNonNull(callback); this.enqueuedTicks = now; } diff --git a/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/InitialClientActorContext.java b/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/InitialClientActorContext.java index 4449dd2fb9..b739a0bc59 100644 --- a/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/InitialClientActorContext.java +++ b/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/InitialClientActorContext.java @@ -7,9 +7,10 @@ */ package org.opendaylight.controller.cluster.access.client; +import static java.util.Objects.requireNonNull; + import akka.actor.ActorSystem; import akka.persistence.SnapshotSelectionCriteria; -import com.google.common.base.Preconditions; import org.opendaylight.controller.cluster.access.concepts.ClientIdentifier; /** @@ -22,7 +23,7 @@ final class InitialClientActorContext extends AbstractClientActorContext { InitialClientActorContext(final AbstractClientActor actor, final String persistenceId) { super(actor.self(), persistenceId); - this.actor = Preconditions.checkNotNull(actor); + this.actor = requireNonNull(actor); } void saveSnapshot(final ClientIdentifier snapshot) { diff --git a/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/InversibleLockException.java b/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/InversibleLockException.java index 7ec18a265d..a2f2ffd7e8 100644 --- a/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/InversibleLockException.java +++ b/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/InversibleLockException.java @@ -7,8 +7,9 @@ */ package org.opendaylight.controller.cluster.access.client; +import static java.util.Objects.requireNonNull; + import com.google.common.annotations.Beta; -import com.google.common.base.Preconditions; import java.util.concurrent.CountDownLatch; /** @@ -24,7 +25,7 @@ public final class InversibleLockException extends RuntimeException { private final transient CountDownLatch latch; InversibleLockException(final CountDownLatch latch) { - this.latch = Preconditions.checkNotNull(latch); + this.latch = requireNonNull(latch); } public void awaitResolution() { diff --git a/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/ReconnectForwarder.java b/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/ReconnectForwarder.java index 58334f91d7..8217b72861 100644 --- a/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/ReconnectForwarder.java +++ b/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/ReconnectForwarder.java @@ -7,7 +7,7 @@ */ package org.opendaylight.controller.cluster.access.client; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; /** * Forwarder class responsible for routing requests from the previous connection incarnation back to the originator, @@ -20,7 +20,7 @@ public abstract class ReconnectForwarder { private final AbstractReceivingClientConnection successor; protected ReconnectForwarder(final AbstractReceivingClientConnection successor) { - this.successor = Preconditions.checkNotNull(successor); + this.successor = requireNonNull(successor); } protected final void sendToSuccessor(final ConnectionEntry entry) { diff --git a/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/ReconnectingClientConnection.java b/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/ReconnectingClientConnection.java index acf876b6ce..e63e7253bc 100644 --- a/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/ReconnectingClientConnection.java +++ b/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/ReconnectingClientConnection.java @@ -7,7 +7,8 @@ */ package org.opendaylight.controller.cluster.access.client; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import org.opendaylight.controller.cluster.access.concepts.RequestException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -26,7 +27,7 @@ public final class ReconnectingClientConnection extends A ReconnectingClientConnection(final ConnectedClientConnection oldConnection, final RequestException cause) { super(oldConnection); - this.cause = Preconditions.checkNotNull(cause); + this.cause = requireNonNull(cause); } @Override @@ -38,7 +39,7 @@ public final class ReconnectingClientConnection extends A @Override @SuppressWarnings("checkstyle:hiddenField") ClientActorBehavior lockedReconnect(final ClientActorBehavior current, final RequestException cause) { - this.cause = Preconditions.checkNotNull(cause); + this.cause = requireNonNull(cause); LOG.warn("Skipping reconnect of already-reconnecting connection {}", this); return current; } diff --git a/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/RecoveringClientActorBehavior.java b/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/RecoveringClientActorBehavior.java index 5e2b455abc..795c98d721 100644 --- a/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/RecoveringClientActorBehavior.java +++ b/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/RecoveringClientActorBehavior.java @@ -7,9 +7,10 @@ */ package org.opendaylight.controller.cluster.access.client; +import static java.util.Objects.requireNonNull; + import akka.persistence.RecoveryCompleted; import akka.persistence.SnapshotOffer; -import com.google.common.base.Preconditions; import org.opendaylight.controller.cluster.access.concepts.ClientIdentifier; import org.opendaylight.controller.cluster.access.concepts.FrontendIdentifier; import org.slf4j.Logger; @@ -27,7 +28,7 @@ final class RecoveringClientActorBehavior extends AbstractClientActorBehavior Future askDelegate(final MockedSnapshotStoreMessage message) { - Preconditions.checkNotNull(delegate, "Delegate ref wasn't sent"); - final Future ask = Patterns.ask(delegate, message, TIMEOUT); - return transform(ask); + return transform(Patterns.ask(requireNonNull(delegate, "Delegate ref was not sent"), message, TIMEOUT)); } private Future transform(final Future future) { diff --git a/opendaylight/md-sal/messagebus-impl/src/main/java/org/opendaylight/controller/messagebus/app/impl/EventSourceRegistrationImpl.java b/opendaylight/md-sal/messagebus-impl/src/main/java/org/opendaylight/controller/messagebus/app/impl/EventSourceRegistrationImpl.java index dac4f8fee8..89b8a9c313 100644 --- a/opendaylight/md-sal/messagebus-impl/src/main/java/org/opendaylight/controller/messagebus/app/impl/EventSourceRegistrationImpl.java +++ b/opendaylight/md-sal/messagebus-impl/src/main/java/org/opendaylight/controller/messagebus/app/impl/EventSourceRegistrationImpl.java @@ -7,7 +7,8 @@ */ package org.opendaylight.controller.messagebus.app.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import org.opendaylight.controller.messagebus.spi.EventSource; import org.opendaylight.controller.messagebus.spi.EventSourceRegistration; import org.opendaylight.yangtools.concepts.AbstractObjectRegistration; @@ -25,7 +26,7 @@ class EventSourceRegistrationImpl extends AbstractObjectR */ EventSourceRegistrationImpl(T instance, EventSourceTopology eventSourceTopology) { super(instance); - this.eventSourceTopology = Preconditions.checkNotNull(eventSourceTopology); + this.eventSourceTopology = requireNonNull(eventSourceTopology); } @Override diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/GetSnapshotReplyActor.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/GetSnapshotReplyActor.java index a533168bb2..d1e0b5c286 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/GetSnapshotReplyActor.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/GetSnapshotReplyActor.java @@ -7,12 +7,13 @@ */ package org.opendaylight.controller.cluster.raft; +import static java.util.Objects.requireNonNull; + import akka.actor.ActorRef; import akka.actor.PoisonPill; import akka.actor.Props; import akka.actor.ReceiveTimeout; import akka.actor.UntypedAbstractActor; -import com.google.common.base.Preconditions; import java.util.concurrent.TimeoutException; import org.opendaylight.controller.cluster.raft.base.messages.CaptureSnapshot; import org.opendaylight.controller.cluster.raft.base.messages.CaptureSnapshotReply; @@ -82,11 +83,11 @@ class GetSnapshotReplyActor extends UntypedAbstractActor { Params(final CaptureSnapshot captureSnapshot, final ElectionTerm electionTerm, final ActorRef replyToActor, final FiniteDuration receiveTimeout, final String id, final ServerConfigurationPayload peerInfo) { - this.captureSnapshot = Preconditions.checkNotNull(captureSnapshot); - this.electionTerm = Preconditions.checkNotNull(electionTerm); - this.replyToActor = Preconditions.checkNotNull(replyToActor); - this.receiveTimeout = Preconditions.checkNotNull(receiveTimeout); - this.id = Preconditions.checkNotNull(id); + this.captureSnapshot = requireNonNull(captureSnapshot); + this.electionTerm = requireNonNull(electionTerm); + this.replyToActor = requireNonNull(replyToActor); + this.receiveTimeout = requireNonNull(receiveTimeout); + this.id = requireNonNull(id); this.peerInformation = peerInfo; } } diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActor.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActor.java index dc97336a49..9195ad3b1b 100755 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActor.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActor.java @@ -16,7 +16,7 @@ import akka.actor.ActorSelection; import akka.actor.PoisonPill; import akka.actor.Status; import com.google.common.annotations.VisibleForTesting; -import com.google.common.collect.Lists; +import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.List; @@ -480,7 +480,7 @@ public abstract class RaftActor extends AbstractUntypedPersistentActor { if (getCurrentBehavior() instanceof AbstractLeader) { AbstractLeader leader = (AbstractLeader)getCurrentBehavior(); Collection followerIds = leader.getFollowerIds(); - List followerInfoList = Lists.newArrayListWithCapacity(followerIds.size()); + List followerInfoList = new ArrayList<>(followerIds.size()); for (String id: followerIds) { final FollowerLogInformation info = leader.getFollower(id); followerInfoList.add(new FollowerInfo(id, info.getNextIndex(), info.getMatchIndex(), diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorDelegatingPersistentDataProvider.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorDelegatingPersistentDataProvider.java index 238b7e7785..0bd8638260 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorDelegatingPersistentDataProvider.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorDelegatingPersistentDataProvider.java @@ -7,8 +7,9 @@ */ package org.opendaylight.controller.cluster.raft; +import static java.util.Objects.requireNonNull; + import akka.japi.Procedure; -import com.google.common.base.Preconditions; import org.opendaylight.controller.cluster.DataPersistenceProvider; import org.opendaylight.controller.cluster.DelegatingPersistentDataProvider; import org.opendaylight.controller.cluster.PersistentDataProvider; @@ -24,10 +25,10 @@ import org.opendaylight.controller.cluster.raft.protobuff.client.messages.Persis class RaftActorDelegatingPersistentDataProvider extends DelegatingPersistentDataProvider { private final PersistentDataProvider persistentProvider; - RaftActorDelegatingPersistentDataProvider(DataPersistenceProvider delegate, - PersistentDataProvider persistentProvider) { + RaftActorDelegatingPersistentDataProvider(final DataPersistenceProvider delegate, + final PersistentDataProvider persistentProvider) { super(delegate); - this.persistentProvider = Preconditions.checkNotNull(persistentProvider); + this.persistentProvider = requireNonNull(persistentProvider); } @Override @@ -36,7 +37,7 @@ class RaftActorDelegatingPersistentDataProvider extends DelegatingPersistentData } @Override - public void persistAsync(T entry, Procedure procedure) { + public void persistAsync(final T entry, final Procedure procedure) { doPersist(entry, procedure, true); } diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/SnapshotManager.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/SnapshotManager.java index 02269a289b..e6dc8bb367 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/SnapshotManager.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/SnapshotManager.java @@ -55,7 +55,7 @@ public class SnapshotManager implements SnapshotState { private CaptureSnapshot captureSnapshot; private long lastSequenceNumber = -1; - private Consumer> createSnapshotProcedure; + private Consumer> createSnapshotProcedure = null; private ApplySnapshot applySnapshot; private RaftActorSnapshotCohort snapshotCohort = NoopRaftActorSnapshotCohort.INSTANCE; diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/TimedRunnable.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/TimedRunnable.java index 9560665756..f16e5e2b59 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/TimedRunnable.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/TimedRunnable.java @@ -7,8 +7,9 @@ */ package org.opendaylight.controller.cluster.raft; +import static java.util.Objects.requireNonNull; + import akka.actor.Cancellable; -import com.google.common.base.Preconditions; import scala.concurrent.duration.FiniteDuration; /** @@ -26,11 +27,10 @@ abstract class TimedRunnable implements Runnable { private final Cancellable cancelTimer; private boolean canRun = true; - TimedRunnable(FiniteDuration timeout, RaftActor actor) { - Preconditions.checkNotNull(timeout); - Preconditions.checkNotNull(actor); - cancelTimer = actor.getContext().system().scheduler().scheduleOnce(timeout, actor.self(), - (Runnable) this::cancel, actor.getContext().system().dispatcher(), actor.self()); + TimedRunnable(final FiniteDuration timeout, final RaftActor actor) { + cancelTimer = requireNonNull(actor).getContext().system().scheduler() + .scheduleOnce(requireNonNull(timeout), actor.self(), (Runnable) this::cancel, + actor.getContext().system().dispatcher(), actor.self()); } @Override diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/EmptyExternalizableProxy.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/EmptyExternalizableProxy.java index 091237a5ca..67f3ed92ae 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/EmptyExternalizableProxy.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/EmptyExternalizableProxy.java @@ -7,7 +7,8 @@ */ package org.opendaylight.controller.cluster.raft.base.messages; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import java.io.Externalizable; import java.io.ObjectInput; import java.io.ObjectOutput; @@ -23,16 +24,16 @@ public abstract class EmptyExternalizableProxy implements Externalizable { private final Object readResolveTo; - protected EmptyExternalizableProxy(Object readResolveTo) { - this.readResolveTo = Preconditions.checkNotNull(readResolveTo); + protected EmptyExternalizableProxy(final Object readResolveTo) { + this.readResolveTo = requireNonNull(readResolveTo); } @Override - public void writeExternal(ObjectOutput out) { + public void writeExternal(final ObjectOutput out) { } @Override - public void readExternal(ObjectInput in) { + public void readExternal(final ObjectInput in) { } protected Object readResolve() { diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractRaftActorBehavior.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractRaftActorBehavior.java index 087c656b18..2b28c37248 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractRaftActorBehavior.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractRaftActorBehavior.java @@ -5,12 +5,12 @@ * 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.raft.behaviors; +import static java.util.Objects.requireNonNull; + import akka.actor.ActorRef; import akka.actor.Cancellable; -import com.google.common.base.Preconditions; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.Random; import java.util.concurrent.TimeUnit; @@ -64,8 +64,8 @@ public abstract class AbstractRaftActorBehavior implements RaftActorBehavior { private long replicatedToAllIndex = -1; AbstractRaftActorBehavior(final RaftActorContext context, final RaftState state) { - this.context = Preconditions.checkNotNull(context); - this.state = Preconditions.checkNotNull(state); + this.context = requireNonNull(context); + this.state = requireNonNull(state); this.log = context.getLogger(); logName = String.format("%s (%s)", context.getId(), state); diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/SyncStatusTracker.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/SyncStatusTracker.java index 20714493e8..2b700ffc43 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/SyncStatusTracker.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/SyncStatusTracker.java @@ -5,11 +5,12 @@ * 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.raft.behaviors; +import static com.google.common.base.Preconditions.checkArgument; +import static java.util.Objects.requireNonNull; + import akka.actor.ActorRef; -import com.google.common.base.Preconditions; import org.opendaylight.controller.cluster.raft.base.messages.FollowerInitialSyncUpStatus; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,7 +29,7 @@ public class SyncStatusTracker { final String leaderId; LeaderInfo(final String leaderId, final long minimumCommitIndex) { - this.leaderId = Preconditions.checkNotNull(leaderId); + this.leaderId = requireNonNull(leaderId); this.minimumCommitIndex = minimumCommitIndex; } } @@ -46,14 +47,14 @@ public class SyncStatusTracker { private boolean syncStatus; public SyncStatusTracker(final ActorRef actor, final String id, final long syncThreshold) { - this.actor = Preconditions.checkNotNull(actor, "actor should not be null"); - this.id = Preconditions.checkNotNull(id, "id should not be null"); - Preconditions.checkArgument(syncThreshold >= 0, "syncThreshold should be greater than or equal to 0"); + this.actor = requireNonNull(actor, "actor should not be null"); + this.id = requireNonNull(id, "id should not be null"); + checkArgument(syncThreshold >= 0, "syncThreshold should be greater than or equal to 0"); this.syncThreshold = syncThreshold; } public void update(final String leaderId, final long leaderCommit, final long commitIndex) { - Preconditions.checkNotNull(leaderId, "leaderId should not be null"); + requireNonNull(leaderId, "leaderId should not be null"); if (syncTarget == null || !leaderId.equals(syncTarget.leaderId)) { LOG.debug("{}: Last sync leader does not match current leader {}, need to catch up to {}", id, diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/RemoveServer.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/RemoveServer.java index 9f4977e83c..0c74d890d8 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/RemoveServer.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/RemoveServer.java @@ -5,10 +5,10 @@ * 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.raft.messages; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import java.io.Serializable; /** @@ -19,8 +19,8 @@ public class RemoveServer implements Serializable { private final String serverId; - public RemoveServer(String serverId) { - this.serverId = Preconditions.checkNotNull(serverId); + public RemoveServer(final String serverId) { + this.serverId = requireNonNull(serverId); } public String getServerId() { diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/RequestLeadership.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/RequestLeadership.java index 5561085539..766c5c4338 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/RequestLeadership.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/RequestLeadership.java @@ -5,11 +5,11 @@ * 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.raft.messages; +import static java.util.Objects.requireNonNull; + import akka.actor.ActorRef; -import com.google.common.base.Preconditions; import java.io.Serializable; /** @@ -22,8 +22,8 @@ public final class RequestLeadership implements Serializable { private final ActorRef replyTo; public RequestLeadership(final String requestedFollowerId, final ActorRef replyTo) { - this.requestedFollowerId = Preconditions.checkNotNull(requestedFollowerId); - this.replyTo = Preconditions.checkNotNull(replyTo); + this.requestedFollowerId = requireNonNull(requestedFollowerId); + this.replyTo = requireNonNull(replyTo); } public String getRequestedFollowerId() { diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/ServerRemoved.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/ServerRemoved.java index 3375137ada..a7de8ea1a7 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/ServerRemoved.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/ServerRemoved.java @@ -5,10 +5,10 @@ * 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.raft.messages; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import java.io.Serializable; /** @@ -20,8 +20,8 @@ public class ServerRemoved implements Serializable { private final String serverId; - public ServerRemoved(String serverId) { - this.serverId = Preconditions.checkNotNull(serverId); + public ServerRemoved(final String serverId) { + this.serverId = requireNonNull(serverId); } public String getServerId() { diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/persisted/SimpleReplicatedLogEntry.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/persisted/SimpleReplicatedLogEntry.java index 14ce5420d2..4c07e6b812 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/persisted/SimpleReplicatedLogEntry.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/persisted/SimpleReplicatedLogEntry.java @@ -5,10 +5,10 @@ * 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.raft.persisted; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import java.io.Externalizable; import java.io.IOException; import java.io.ObjectInput; @@ -39,7 +39,7 @@ public final class SimpleReplicatedLogEntry implements ReplicatedLogEntry, Seria this.replicatedLogEntry = replicatedLogEntry; } - static int estimatedSerializedSize(ReplicatedLogEntry replicatedLogEntry) { + static int estimatedSerializedSize(final ReplicatedLogEntry replicatedLogEntry) { return 8 /* index */ + 8 /* term */ + replicatedLogEntry.getData().size() + 400 /* estimated extra padding for class info */; } @@ -75,10 +75,10 @@ public final class SimpleReplicatedLogEntry implements ReplicatedLogEntry, Seria * @param term the term * @param payload the payload */ - public SimpleReplicatedLogEntry(long index, long term, Payload payload) { + public SimpleReplicatedLogEntry(final long index, final long term, final Payload payload) { this.index = index; this.term = term; - this.payload = Preconditions.checkNotNull(payload); + this.payload = requireNonNull(payload); } @Override @@ -107,7 +107,7 @@ public final class SimpleReplicatedLogEntry implements ReplicatedLogEntry, Seria } @Override - public void setPersistencePending(boolean pending) { + public void setPersistencePending(final boolean pending) { persistencePending = pending; } @@ -130,7 +130,7 @@ public final class SimpleReplicatedLogEntry implements ReplicatedLogEntry, Seria } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorContextImplTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorContextImplTest.java index cf09ab59e6..815b8d9d48 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorContextImplTest.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorContextImplTest.java @@ -20,7 +20,6 @@ import static org.mockito.Mockito.verify; import akka.actor.Props; import akka.testkit.TestActorRef; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Maps; import com.google.common.util.concurrent.MoreExecutors; import java.util.Arrays; import java.util.HashMap; @@ -85,7 +84,7 @@ public class RaftActorContextImplTest extends AbstractActorTest { DefaultConfigParamsImpl configParams = new DefaultConfigParamsImpl(); RaftActorContextImpl context = new RaftActorContextImpl(actor, actor.underlyingActor().getContext(), "test", new ElectionTermImpl(createProvider(), "test", LOG), -1, -1, - Maps.newHashMap(ImmutableMap.of("peer1", "peerAddress1")), configParams, + new HashMap<>(ImmutableMap.of("peer1", "peerAddress1")), configParams, createProvider(), applyState -> { }, LOG, MoreExecutors.directExecutor()); context.setPeerAddress("peer1", "peerAddress1_1"); @@ -99,7 +98,7 @@ public class RaftActorContextImplTest extends AbstractActorTest { public void testUpdatePeerIds() { RaftActorContextImpl context = new RaftActorContextImpl(actor, actor.underlyingActor().getContext(), "self", new ElectionTermImpl(createProvider(), "test", LOG), -1, -1, - Maps.newHashMap(ImmutableMap.of("peer1", "peerAddress1")), + new HashMap<>(ImmutableMap.of("peer1", "peerAddress1")), new DefaultConfigParamsImpl(), createProvider(), applyState -> { }, LOG, MoreExecutors.directExecutor()); diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorServerConfigurationSupportTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorServerConfigurationSupportTest.java index 54ba69ec84..140735b646 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorServerConfigurationSupportTest.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorServerConfigurationSupportTest.java @@ -23,8 +23,7 @@ import akka.testkit.TestActorRef; import akka.testkit.javadsl.TestKit; import com.google.common.base.Stopwatch; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; +import com.google.common.collect.ImmutableSet; import com.google.common.io.ByteSource; import com.google.common.util.concurrent.MoreExecutors; import java.io.OutputStream; @@ -32,6 +31,8 @@ import java.time.Duration; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Optional; @@ -203,9 +204,9 @@ public class RaftActorServerConfigurationSupportTest extends AbstractActorTest { // Verify new server config was applied in both followers - assertEquals("Follower peers", Sets.newHashSet(LEADER_ID, NEW_SERVER_ID), followerActorContext.getPeerIds()); + assertEquals("Follower peers", ImmutableSet.of(LEADER_ID, NEW_SERVER_ID), followerActorContext.getPeerIds()); - assertEquals("New follower peers", Sets.newHashSet(LEADER_ID, FOLLOWER_ID), + assertEquals("New follower peers", ImmutableSet.of(LEADER_ID, FOLLOWER_ID), newFollowerActorContext.getPeerIds()); assertEquals("Follower commit index", 3, followerActorContext.getCommitIndex()); @@ -277,7 +278,7 @@ public class RaftActorServerConfigurationSupportTest extends AbstractActorTest { // Verify new server config was applied in the new follower - assertEquals("New follower peers", Sets.newHashSet(LEADER_ID), newFollowerActorContext.getPeerIds()); + assertEquals("New follower peers", ImmutableSet.of(LEADER_ID), newFollowerActorContext.getPeerIds()); LOG.info("testAddServerWithNoExistingFollower ending"); } @@ -324,7 +325,7 @@ public class RaftActorServerConfigurationSupportTest extends AbstractActorTest { // Verify new server config was applied in the new follower - assertEquals("New follower peers", Sets.newHashSet(LEADER_ID), newFollowerActorContext.getPeerIds()); + assertEquals("New follower peers", ImmutableSet.of(LEADER_ID), newFollowerActorContext.getPeerIds()); assertNoneMatching(newFollowerCollectorActor, InstallSnapshot.class, 500); @@ -409,7 +410,7 @@ public class RaftActorServerConfigurationSupportTest extends AbstractActorTest { // Verify ServerConfigurationPayload entry in the new follower expectMatching(newFollowerCollectorActor, ApplyState.class, 2); - assertEquals("New follower peers", Sets.newHashSet(LEADER_ID, NEW_SERVER_ID2), + assertEquals("New follower peers", ImmutableSet.of(LEADER_ID, NEW_SERVER_ID2), newFollowerActorContext.getPeerIds()); LOG.info("testAddServerWithOperationInProgress ending"); @@ -1283,8 +1284,8 @@ public class RaftActorServerConfigurationSupportTest extends AbstractActorTest { ServerChangeReply reply = testKit.expectMsgClass(Duration.ofSeconds(5), ServerChangeReply.class); assertEquals("getStatus", ServerChangeStatus.NO_LEADER, reply.getStatus()); - assertEquals("Server config", Sets.newHashSet(nonVotingServer(node1ID), votingServer(node2ID)), - Sets.newHashSet(node1RaftActor.getRaftActorContext().getPeerServerInfo(true).getServerConfig())); + assertEquals("Server config", ImmutableSet.of(nonVotingServer(node1ID), votingServer(node2ID)), + new HashSet<>(node1RaftActor.getRaftActorContext().getPeerServerInfo(true).getServerConfig())); assertEquals("getRaftState", RaftState.Follower, node1RaftActor.getRaftState()); LOG.info("testChangeToVotingWithNoLeaderAndElectionTimeout ending"); @@ -1463,7 +1464,7 @@ public class RaftActorServerConfigurationSupportTest extends AbstractActorTest { ReplicatedLogEntry logEntry = log.get(log.lastIndex()); assertEquals("Last log entry payload class", ServerConfigurationPayload.class, logEntry.getData().getClass()); ServerConfigurationPayload payload = (ServerConfigurationPayload)logEntry.getData(); - assertEquals("Server config", Sets.newHashSet(expected), Sets.newHashSet(payload.getServerConfig())); + assertEquals("Server config", ImmutableSet.copyOf(expected), new HashSet<>(payload.getServerConfig())); } private static RaftActorContextImpl newFollowerContext(final String id, @@ -1590,8 +1591,7 @@ public class RaftActorServerConfigurationSupportTest extends AbstractActorTest { public static class MockNewFollowerRaftActor extends AbstractMockRaftActor { public MockNewFollowerRaftActor(final ConfigParams config, final ActorRef collectorActor) { - super(NEW_SERVER_ID, Maps.newHashMap(), Optional.of(config), NO_PERSISTENCE, - collectorActor); + super(NEW_SERVER_ID, new HashMap<>(), Optional.of(config), NO_PERSISTENCE, collectorActor); setPersistence(false); } diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/utils/InMemorySnapshotStore.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/utils/InMemorySnapshotStore.java index e9bd04bf86..662a063788 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/utils/InMemorySnapshotStore.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/utils/InMemorySnapshotStore.java @@ -5,7 +5,6 @@ * 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.raft.utils; import akka.dispatch.Futures; @@ -13,7 +12,6 @@ import akka.persistence.SelectedSnapshot; import akka.persistence.SnapshotMetadata; import akka.persistence.SnapshotSelectionCriteria; import akka.persistence.snapshot.japi.SnapshotStore; -import com.google.common.collect.Lists; import com.google.common.util.concurrent.Uninterruptibles; import java.util.ArrayList; import java.util.Collections; @@ -59,7 +57,7 @@ public class InMemorySnapshotStore extends SnapshotStore { List retList; synchronized (stored) { - retList = Lists.newArrayListWithCapacity(stored.size()); + retList = new ArrayList<>(stored.size()); for (StoredSnapshot s: stored) { if (type.isInstance(s.data)) { retList.add((T) s.data); diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/AbstractNotificationListenerRegistration.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/AbstractNotificationListenerRegistration.java index 71b6593bb7..4d53384c8e 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/AbstractNotificationListenerRegistration.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/AbstractNotificationListenerRegistration.java @@ -7,7 +7,8 @@ */ package org.opendaylight.controller.md.sal.binding.compat; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import org.opendaylight.controller.sal.binding.api.NotificationListener; import org.opendaylight.yangtools.concepts.AbstractListenerRegistration; import org.opendaylight.yangtools.yang.binding.Notification; @@ -25,7 +26,7 @@ abstract class AbstractNotificationListenerRegistration protected AbstractNotificationListenerRegistration(final Class type, final NotificationListener listener) { super(listener); - this.type = Preconditions.checkNotNull(type); + this.type = requireNonNull(type); } @Override diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/AggregatedNotificationListenerRegistration.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/AggregatedNotificationListenerRegistration.java index a095808353..3fee8bf2b8 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/AggregatedNotificationListenerRegistration.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/AggregatedNotificationListenerRegistration.java @@ -7,7 +7,8 @@ */ package org.opendaylight.controller.md.sal.binding.compat; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import org.opendaylight.controller.sal.binding.api.NotificationListener; import org.opendaylight.yangtools.yang.binding.Notification; @@ -31,7 +32,7 @@ abstract class AggregatedNotificationListenerRegistration type, final NotificationListener listener, final A aggregator) { super(type, listener); - this.aggregator = Preconditions.checkNotNull(aggregator); + this.aggregator = requireNonNull(aggregator); } protected A getAggregator() { diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractForwardedTransaction.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractForwardedTransaction.java index 2466b49176..dc81ce085e 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractForwardedTransaction.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractForwardedTransaction.java @@ -7,6 +7,8 @@ */ package org.opendaylight.controller.md.sal.binding.impl; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.CheckedFuture; @@ -32,11 +34,10 @@ abstract class AbstractForwardedTransaction implements DOMDataTreeChangeListener { - private final BindingToNormalizedNodeCodec codec; private final DataTreeChangeListener listener; private final LogicalDatastoreType store; BindingDOMDataTreeChangeListenerAdapter(final BindingToNormalizedNodeCodec codec, final DataTreeChangeListener listener, final LogicalDatastoreType store) { - this.codec = Preconditions.checkNotNull(codec); - this.listener = Preconditions.checkNotNull(listener); - this.store = Preconditions.checkNotNull(store); + this.codec = requireNonNull(codec); + this.listener = requireNonNull(listener); + this.store = requireNonNull(store); } @Override diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMDataTreeChangeServiceAdapter.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMDataTreeChangeServiceAdapter.java index 5c488da005..0c99a0e2ea 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMDataTreeChangeServiceAdapter.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMDataTreeChangeServiceAdapter.java @@ -7,7 +7,8 @@ */ package org.opendaylight.controller.md.sal.binding.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import org.opendaylight.controller.md.sal.binding.api.ClusteredDataTreeChangeListener; import org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener; import org.opendaylight.controller.md.sal.binding.api.DataTreeChangeService; @@ -18,7 +19,6 @@ import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; - /** * Adapter exposing Binding {@link DataTreeChangeService} and wrapping * {@link DOMDataTreeChangeService} and is responsible for translation @@ -37,8 +37,8 @@ final class BindingDOMDataTreeChangeServiceAdapter implements DataTreeChangeServ private BindingDOMDataTreeChangeServiceAdapter(final BindingToNormalizedNodeCodec codec, final DOMDataTreeChangeService dataTreeChangeService) { - this.codec = Preconditions.checkNotNull(codec); - this.dataTreeChangeService = Preconditions.checkNotNull(dataTreeChangeService); + this.codec = requireNonNull(codec); + this.dataTreeChangeService = requireNonNull(dataTreeChangeService); } static DataTreeChangeService create(final BindingToNormalizedNodeCodec codec, diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMTransactionChainAdapter.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMTransactionChainAdapter.java index b6210316c0..2551f7a4e7 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMTransactionChainAdapter.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMTransactionChainAdapter.java @@ -7,7 +7,9 @@ */ package org.opendaylight.controller.md.sal.binding.impl; -import com.google.common.base.Preconditions; +import static com.google.common.base.Preconditions.checkState; +import static java.util.Objects.requireNonNull; + import com.google.common.util.concurrent.FluentFuture; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.MoreExecutors; @@ -40,10 +42,10 @@ final class BindingDOMTransactionChainAdapter implements BindingTransactionChain BindingDOMTransactionChainAdapter(final DOMDataBroker chainFactory, final BindingToNormalizedNodeCodec codec, final TransactionChainListener listener) { - Preconditions.checkNotNull(chainFactory, "DOM Transaction chain factory must not be null"); this.domListener = new DelegateChainListener(); this.bindingListener = listener; - this.delegate = chainFactory.createTransactionChain(domListener); + this.delegate = requireNonNull(chainFactory, "DOM Transaction chain factory must not be null") + .createTransactionChain(domListener); this.codec = codec; } @@ -117,12 +119,10 @@ final class BindingDOMTransactionChainAdapter implements BindingTransactionChain } private final class DelegateChainListener implements TransactionChainListener { - @Override public void onTransactionChainFailed(final TransactionChain chain, final AsyncTransaction transaction, final Throwable cause) { - Preconditions.checkState(delegate.equals(chain), - "Illegal state - listener for %s was invoked for incorrect chain %s.", delegate, chain); + checkChain(chain); /* * Intentionally NOOP, callback for failure, since we * are also listening on each transaction future for failure, @@ -130,17 +130,20 @@ final class BindingDOMTransactionChainAdapter implements BindingTransactionChain * of this transaction chain), instead of DOM transaction * which is known only to this chain, binding transaction implementation * and underlying transaction chain. - * */ LOG.debug("Transaction chain {} failed. Failed DOM Transaction {}",this,transaction,cause); } @Override public void onTransactionChainSuccessful(final TransactionChain chain) { - Preconditions.checkState(delegate.equals(chain), - "Illegal state - listener for %s was invoked for incorrect chain %s.", delegate, chain); + checkChain(chain); bindingListener.onTransactionChainSuccessful(BindingDOMTransactionChainAdapter.this); } + + private void checkChain(final TransactionChain chain) { + checkState(delegate.equals(chain), "Illegal state - listener for %s was invoked for incorrect chain %s.", + delegate, chain); + } } } diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDataTreeChangeListenerRegistration.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDataTreeChangeListenerRegistration.java index cdc2d35cd5..0b5c92d3c1 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDataTreeChangeListenerRegistration.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDataTreeChangeListenerRegistration.java @@ -7,7 +7,8 @@ */ package org.opendaylight.controller.md.sal.binding.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener; import org.opendaylight.yangtools.concepts.AbstractListenerRegistration; import org.opendaylight.yangtools.concepts.ListenerRegistration; @@ -20,7 +21,7 @@ class BindingDataTreeChangeListenerRegistration domReg) { super(listener); - this.domReg = Preconditions.checkNotNull(domReg); + this.domReg = requireNonNull(domReg); } @Override diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/LazyDOMRpcResultFuture.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/LazyDOMRpcResultFuture.java index 636f0b88b7..1acdd24675 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/LazyDOMRpcResultFuture.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/LazyDOMRpcResultFuture.java @@ -7,7 +7,8 @@ */ package org.opendaylight.controller.md.sal.binding.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Throwables; import com.google.common.util.concurrent.CheckedFuture; import com.google.common.util.concurrent.ListenableFuture; @@ -33,8 +34,8 @@ final class LazyDOMRpcResultFuture implements CheckedFuture> delegate, final BindingNormalizedNodeSerializer codec) { - this.bindingFuture = Preconditions.checkNotNull(delegate, "delegate"); - this.codec = Preconditions.checkNotNull(codec, "codec"); + this.bindingFuture = requireNonNull(delegate, "delegate"); + this.codec = requireNonNull(codec, "codec"); } static CheckedFuture create(final BindingNormalizedNodeSerializer codec, diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/RpcServiceAdapter.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/RpcServiceAdapter.java index 94b06e8e2c..af2ad1dc5b 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/RpcServiceAdapter.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/RpcServiceAdapter.java @@ -7,7 +7,8 @@ */ package org.opendaylight.controller.md.sal.binding.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import com.google.common.collect.ImmutableMap; import com.google.common.util.concurrent.CheckedFuture; import com.google.common.util.concurrent.Futures; @@ -56,9 +57,9 @@ class RpcServiceAdapter implements InvocationHandler { RpcServiceAdapter(final Class type, final BindingToNormalizedNodeCodec codec, final DOMRpcService domService) { - this.type = Preconditions.checkNotNull(type); - this.codec = Preconditions.checkNotNull(codec); - this.delegate = Preconditions.checkNotNull(domService); + this.type = requireNonNull(type); + this.codec = requireNonNull(codec); + this.delegate = requireNonNull(domService); final ImmutableMap.Builder rpcBuilder = ImmutableMap.builder(); for (final Entry rpc : codec.getRpcMethodToSchema(type).entrySet()) { rpcBuilder.put(rpc.getKey(), createStrategy(rpc.getKey(), rpc.getValue())); diff --git a/opendaylight/md-sal/sal-binding-util/src/main/java/org/opendaylight/controller/md/sal/binding/util/BindingContextUtils.java b/opendaylight/md-sal/sal-binding-util/src/main/java/org/opendaylight/controller/md/sal/binding/util/BindingContextUtils.java index 76457910fb..eaca3417aa 100644 --- a/opendaylight/md-sal/sal-binding-util/src/main/java/org/opendaylight/controller/md/sal/binding/util/BindingContextUtils.java +++ b/opendaylight/md-sal/sal-binding-util/src/main/java/org/opendaylight/controller/md/sal/binding/util/BindingContextUtils.java @@ -7,7 +7,7 @@ */ package org.opendaylight.controller.md.sal.binding.util; -import static com.google.common.base.Preconditions.checkNotNull; +import static java.util.Objects.requireNonNull; import com.google.common.collect.ClassToInstanceMap; import com.google.common.collect.MutableClassToInstanceMap; @@ -31,35 +31,34 @@ public final class BindingContextUtils { private BindingContextUtils() { } - public static ConsumerContext createConsumerContext(BindingAwareConsumer consumer, - ClassToInstanceMap serviceProvider) { - checkNotNull(consumer,"Consumer should not be null"); - checkNotNull(serviceProvider,"Service map should not be null"); - return new SingleConsumerContextImpl(serviceProvider); + public static ConsumerContext createConsumerContext(final BindingAwareConsumer consumer, + final ClassToInstanceMap serviceProvider) { + requireNonNull(consumer, "Consumer should not be null"); + return new SingleConsumerContextImpl(requireNonNull(serviceProvider, "Service map should not be null")); } - public static ProviderContext createProviderContext(BindingAwareProvider provider, - ClassToInstanceMap serviceProvider) { - checkNotNull(provider,"Provider should not be null"); - checkNotNull(serviceProvider,"Service map should not be null"); - return new SingleProviderContextImpl(serviceProvider); + public static ProviderContext createProviderContext(final BindingAwareProvider provider, + final ClassToInstanceMap serviceProvider) { + requireNonNull(provider, "Provider should not be null"); + return new SingleProviderContextImpl(requireNonNull(serviceProvider, "Service map should not be null")); } - public static ConsumerContext createConsumerContextAndInitialize(BindingAwareConsumer consumer, - ClassToInstanceMap serviceProvider) { + public static ConsumerContext createConsumerContextAndInitialize(final BindingAwareConsumer consumer, + final ClassToInstanceMap serviceProvider) { ConsumerContext context = createConsumerContext(consumer, serviceProvider); consumer.onSessionInitialized(context); return context; } - public static ProviderContext createProviderContextAndInitialize(BindingAwareProvider provider, - ClassToInstanceMap serviceProvider) { + public static ProviderContext createProviderContextAndInitialize(final BindingAwareProvider provider, + final ClassToInstanceMap serviceProvider) { ProviderContext context = createProviderContext(provider, serviceProvider); provider.onSessionInitiated(context); return context; } - public static T createContextProxyOrReturnService(Class service, T instance) { + public static T createContextProxyOrReturnService(final Class service, + final T instance) { // FIXME: Create Proxy return instance; } @@ -69,27 +68,27 @@ public final class BindingContextUtils { private ClassToInstanceMap alreadyRetrievedServices; private ClassToInstanceMap serviceProvider; - SingleConsumerContextImpl(ClassToInstanceMap serviceProvider) { + SingleConsumerContextImpl(final ClassToInstanceMap serviceProvider) { this.alreadyRetrievedServices = MutableClassToInstanceMap.create(); this.serviceProvider = serviceProvider; } @Override - public final T getRpcService(Class module) { + public final T getRpcService(final Class module) { return getSALService(RpcConsumerRegistry.class).getRpcService(module); } @Override - public final T getSALService(Class service) { - checkNotNull(service,"Service class should not be null."); - T potential = alreadyRetrievedServices.getInstance(service); + public final T getSALService(final Class service) { + T potential = alreadyRetrievedServices.getInstance(requireNonNull(service, + "Service class should not be null.")); if (potential != null) { return potential; } return tryToRetrieveSalService(service); } - private synchronized T tryToRetrieveSalService(Class service) { + private synchronized T tryToRetrieveSalService(final Class service) { final T potential = alreadyRetrievedServices.getInstance(service); if (potential != null) { return potential; @@ -111,26 +110,25 @@ public final class BindingContextUtils { } private static class SingleProviderContextImpl extends SingleConsumerContextImpl implements ProviderContext { - - SingleProviderContextImpl(ClassToInstanceMap serviceProvider) { + SingleProviderContextImpl(final ClassToInstanceMap serviceProvider) { super(serviceProvider); } @Override public >> ListenerRegistration - registerRouteChangeListener(L listener) { + registerRouteChangeListener(final L listener) { return getSALService(RpcProviderRegistry.class).registerRouteChangeListener(listener); } @Override - public RoutedRpcRegistration addRoutedRpcImplementation(Class type, - T implementation) throws IllegalStateException { + public RoutedRpcRegistration addRoutedRpcImplementation(final Class type, + final T implementation) { return getSALService(RpcProviderRegistry.class).addRoutedRpcImplementation(type, implementation); } @Override - public RpcRegistration addRpcImplementation(Class type, T implementation) - throws IllegalStateException { + public RpcRegistration addRpcImplementation(final Class type, + final T implementation) { return getSALService(RpcProviderRegistry.class).addRpcImplementation(type, implementation); } } diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/Dispatchers.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/Dispatchers.java index aaa9ad6c81..62043e24c3 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/Dispatchers.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/common/actor/Dispatchers.java @@ -5,10 +5,10 @@ * 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.common.actor; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import scala.concurrent.ExecutionContext; public class Dispatchers { @@ -50,8 +50,7 @@ public class Dispatchers { } public Dispatchers(final akka.dispatch.Dispatchers dispatchers) { - Preconditions.checkNotNull(dispatchers, "dispatchers should not be null"); - this.dispatchers = dispatchers; + this.dispatchers = requireNonNull(dispatchers, "dispatchers should not be null"); } public ExecutionContext getDispatcher(final DispatcherType dispatcherType) { diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NormalizedNodeNavigator.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NormalizedNodeNavigator.java index a4e0b70a02..0bf1a2fe01 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NormalizedNodeNavigator.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/NormalizedNodeNavigator.java @@ -5,12 +5,10 @@ * 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.datastore.node.utils; -import com.google.common.base.Preconditions; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; -import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; +import static java.util.Objects.requireNonNull; + import org.opendaylight.yangtools.yang.data.api.schema.DataContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.MixinNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; @@ -21,30 +19,26 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodeContainer; */ public class NormalizedNodeNavigator { - private final org.opendaylight.controller.cluster.datastore.node.utils.NormalizedNodeVisitor visitor; + private final NormalizedNodeVisitor visitor; - public NormalizedNodeNavigator( - org.opendaylight.controller.cluster.datastore.node.utils.NormalizedNodeVisitor visitor) { - Preconditions.checkNotNull(visitor, "visitor should not be null"); - this.visitor = visitor; + public NormalizedNodeNavigator(final NormalizedNodeVisitor visitor) { + this.visitor = requireNonNull(visitor, "visitor should not be null"); } - public void navigate(String parentPath, NormalizedNode normalizedNode) { + public void navigate(String parentPath, final NormalizedNode normalizedNode) { if (parentPath == null) { parentPath = ""; } navigateNormalizedNode(0, parentPath, normalizedNode); } - private void navigateDataContainerNode(int level, final String parentPath, + private void navigateDataContainerNode(final int level, final String parentPath, final DataContainerNode dataContainerNode) { visitor.visitNode(level, parentPath, dataContainerNode); String newParentPath = parentPath + "/" + dataContainerNode.getIdentifier().toString(); - final Iterable> value = dataContainerNode - .getValue(); - for (NormalizedNode node : value) { + for (NormalizedNode node : dataContainerNode.getValue()) { if (node instanceof MixinNode && node instanceof NormalizedNodeContainer) { navigateNormalizedNodeContainerMixin(level, newParentPath, (NormalizedNodeContainer) node); } else { @@ -54,14 +48,13 @@ public class NormalizedNodeNavigator { } - private void navigateNormalizedNodeContainerMixin(int level, final String parentPath, - NormalizedNodeContainer node) { + private void navigateNormalizedNodeContainerMixin(final int level, final String parentPath, + final NormalizedNodeContainer node) { visitor.visitNode(level, parentPath, node); String newParentPath = parentPath + "/" + node.getIdentifier().toString(); - final Iterable> value = node.getValue(); - for (NormalizedNode normalizedNode : value) { + for (NormalizedNode normalizedNode : node.getValue()) { if (normalizedNode instanceof MixinNode && normalizedNode instanceof NormalizedNodeContainer) { navigateNormalizedNodeContainerMixin(level + 1, newParentPath, (NormalizedNodeContainer) normalizedNode); @@ -72,7 +65,8 @@ public class NormalizedNodeNavigator { } - private void navigateNormalizedNode(int level, String parentPath, NormalizedNode normalizedNode) { + private void navigateNormalizedNode(final int level, final String parentPath, + final NormalizedNode normalizedNode) { if (normalizedNode instanceof DataContainerNode) { final DataContainerNode dataContainerNode = (DataContainerNode) normalizedNode; diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/AbstractNormalizedNodeDataOutput.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/AbstractNormalizedNodeDataOutput.java index 161a450ddc..863fd0c8af 100755 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/AbstractNormalizedNodeDataOutput.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/stream/AbstractNormalizedNodeDataOutput.java @@ -7,7 +7,10 @@ */ package org.opendaylight.controller.cluster.datastore.node.utils.stream; -import com.google.common.base.Preconditions; +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkState; +import static java.util.Objects.requireNonNull; + import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.DataOutput; import java.io.IOException; @@ -47,7 +50,7 @@ abstract class AbstractNormalizedNodeDataOutput implements NormalizedNodeDataOut private boolean inSimple; AbstractNormalizedNodeDataOutput(final DataOutput output) { - this.output = Preconditions.checkNotNull(output); + this.output = requireNonNull(output); } private void ensureHeaderWritten() throws IOException { @@ -162,7 +165,7 @@ abstract class AbstractNormalizedNodeDataOutput implements NormalizedNodeDataOut @Override public void startLeafNode(final NodeIdentifier name) throws IOException { - Preconditions.checkNotNull(name, "Node identifier should not be null"); + requireNonNull(name, "Node identifier should not be null"); LOG.trace("Starting a new leaf node"); startNode(name.getNodeType(), NodeTypes.LEAF_NODE); inSimple = true; @@ -170,7 +173,7 @@ abstract class AbstractNormalizedNodeDataOutput implements NormalizedNodeDataOut @Override public void startLeafSet(final NodeIdentifier name, final int childSizeHint) throws IOException { - Preconditions.checkNotNull(name, "Node identifier should not be null"); + requireNonNull(name, "Node identifier should not be null"); LOG.trace("Starting a new leaf set"); lastLeafSetQName = name.getNodeType(); @@ -179,7 +182,7 @@ abstract class AbstractNormalizedNodeDataOutput implements NormalizedNodeDataOut @Override public void startOrderedLeafSet(final NodeIdentifier name, final int childSizeHint) throws IOException { - Preconditions.checkNotNull(name, "Node identifier should not be null"); + requireNonNull(name, "Node identifier should not be null"); LOG.trace("Starting a new ordered leaf set"); lastLeafSetQName = name.getNodeType(); @@ -202,7 +205,7 @@ abstract class AbstractNormalizedNodeDataOutput implements NormalizedNodeDataOut @Override public void startContainerNode(final NodeIdentifier name, final int childSizeHint) throws IOException { - Preconditions.checkNotNull(name, "Node identifier should not be null"); + requireNonNull(name, "Node identifier should not be null"); LOG.trace("Starting a new container node"); @@ -211,7 +214,7 @@ abstract class AbstractNormalizedNodeDataOutput implements NormalizedNodeDataOut @Override public void startYangModeledAnyXmlNode(final NodeIdentifier name, final int childSizeHint) throws IOException { - Preconditions.checkNotNull(name, "Node identifier should not be null"); + requireNonNull(name, "Node identifier should not be null"); LOG.trace("Starting a new yang modeled anyXml node"); @@ -220,7 +223,7 @@ abstract class AbstractNormalizedNodeDataOutput implements NormalizedNodeDataOut @Override public void startUnkeyedList(final NodeIdentifier name, final int childSizeHint) throws IOException { - Preconditions.checkNotNull(name, "Node identifier should not be null"); + requireNonNull(name, "Node identifier should not be null"); LOG.trace("Starting a new unkeyed list"); startNode(name.getNodeType(), NodeTypes.UNKEYED_LIST); @@ -228,7 +231,7 @@ abstract class AbstractNormalizedNodeDataOutput implements NormalizedNodeDataOut @Override public void startUnkeyedListItem(final NodeIdentifier name, final int childSizeHint) throws IOException { - Preconditions.checkNotNull(name, "Node identifier should not be null"); + requireNonNull(name, "Node identifier should not be null"); LOG.trace("Starting a new unkeyed list item"); startNode(name.getNodeType(), NodeTypes.UNKEYED_LIST_ITEM); @@ -236,7 +239,7 @@ abstract class AbstractNormalizedNodeDataOutput implements NormalizedNodeDataOut @Override public void startMapNode(final NodeIdentifier name, final int childSizeHint) throws IOException { - Preconditions.checkNotNull(name, "Node identifier should not be null"); + requireNonNull(name, "Node identifier should not be null"); LOG.trace("Starting a new map node"); startNode(name.getNodeType(), NodeTypes.MAP_NODE); @@ -245,7 +248,7 @@ abstract class AbstractNormalizedNodeDataOutput implements NormalizedNodeDataOut @Override public void startMapEntryNode(final NodeIdentifierWithPredicates identifier, final int childSizeHint) throws IOException { - Preconditions.checkNotNull(identifier, "Node identifier should not be null"); + requireNonNull(identifier, "Node identifier should not be null"); LOG.trace("Starting a new map entry node"); startNode(identifier.getNodeType(), NodeTypes.MAP_ENTRY_NODE); @@ -254,7 +257,7 @@ abstract class AbstractNormalizedNodeDataOutput implements NormalizedNodeDataOut @Override public void startOrderedMapNode(final NodeIdentifier name, final int childSizeHint) throws IOException { - Preconditions.checkNotNull(name, "Node identifier should not be null"); + requireNonNull(name, "Node identifier should not be null"); LOG.trace("Starting a new ordered map node"); startNode(name.getNodeType(), NodeTypes.ORDERED_MAP_NODE); @@ -262,7 +265,7 @@ abstract class AbstractNormalizedNodeDataOutput implements NormalizedNodeDataOut @Override public void startChoiceNode(final NodeIdentifier name, final int childSizeHint) throws IOException { - Preconditions.checkNotNull(name, "Node identifier should not be null"); + requireNonNull(name, "Node identifier should not be null"); LOG.trace("Starting a new choice node"); startNode(name.getNodeType(), NodeTypes.CHOICE_NODE); @@ -270,7 +273,7 @@ abstract class AbstractNormalizedNodeDataOutput implements NormalizedNodeDataOut @Override public void startAugmentationNode(final AugmentationIdentifier identifier) throws IOException { - Preconditions.checkNotNull(identifier, "Node identifier should not be null"); + requireNonNull(identifier, "Node identifier should not be null"); LOG.trace("Starting a new augmentation node"); output.writeByte(NodeTypes.AUGMENTATION_NODE); @@ -279,7 +282,7 @@ abstract class AbstractNormalizedNodeDataOutput implements NormalizedNodeDataOut @Override public void startAnyxmlNode(final NodeIdentifier name) throws IOException { - Preconditions.checkNotNull(name, "Node identifier should not be null"); + requireNonNull(name, "Node identifier should not be null"); LOG.trace("Starting any xml node"); startNode(name.getNodeType(), NodeTypes.ANY_XML_NODE); inSimple = true; @@ -324,8 +327,8 @@ abstract class AbstractNormalizedNodeDataOutput implements NormalizedNodeDataOut } private void startNode(final QName qname, final byte nodeType) throws IOException { - Preconditions.checkNotNull(qname, "QName of node identifier should not be null."); - Preconditions.checkState(!inSimple, "Attempted to start a child in a simple node"); + requireNonNull(qname, "QName of node identifier should not be null."); + checkState(!inSimple, "Attempted to start a child in a simple node"); ensureHeaderWritten(); @@ -338,9 +341,7 @@ abstract class AbstractNormalizedNodeDataOutput implements NormalizedNodeDataOut private void writeObjSet(final Set set) throws IOException { output.writeInt(set.size()); for (Object o : set) { - Preconditions.checkArgument(o instanceof String, "Expected value type to be String but was %s (%s)", - o.getClass(), o); - + checkArgument(o instanceof String, "Expected value type to be String but was %s (%s)", o.getClass(), o); writeString((String) o); } } diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/messaging/AbortSlicing.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/messaging/AbortSlicing.java index b136ed7086..9df2fd4d32 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/messaging/AbortSlicing.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/messaging/AbortSlicing.java @@ -7,7 +7,8 @@ */ package org.opendaylight.controller.cluster.messaging; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import java.io.Externalizable; import java.io.IOException; import java.io.ObjectInput; @@ -26,7 +27,7 @@ class AbortSlicing implements Serializable { private final Identifier identifier; AbortSlicing(final Identifier identifier) { - this.identifier = Preconditions.checkNotNull(identifier); + this.identifier = requireNonNull(identifier); } Identifier getIdentifier() { @@ -53,17 +54,17 @@ class AbortSlicing implements Serializable { public Proxy() { } - Proxy(AbortSlicing abortSlicing) { + Proxy(final AbortSlicing abortSlicing) { this.abortSlicing = abortSlicing; } @Override - public void writeExternal(ObjectOutput out) throws IOException { + public void writeExternal(final ObjectOutput out) throws IOException { out.writeObject(abortSlicing.identifier); } @Override - public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { + public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException { abortSlicing = new AbortSlicing((Identifier) in.readObject()); } diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/messaging/MessageSlice.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/messaging/MessageSlice.java index ae711df74a..50e0460836 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/messaging/MessageSlice.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/messaging/MessageSlice.java @@ -7,10 +7,11 @@ */ package org.opendaylight.controller.cluster.messaging; +import static java.util.Objects.requireNonNull; + import akka.actor.ActorRef; import akka.serialization.JavaSerializer; import akka.serialization.Serialization; -import com.google.common.base.Preconditions; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.Externalizable; import java.io.IOException; @@ -34,14 +35,14 @@ public class MessageSlice implements Serializable { private final int lastSliceHashCode; private final ActorRef replyTo; - MessageSlice(Identifier identifier, byte[] data, int sliceIndex, int totalSlices, int lastSliceHashCode, - final ActorRef replyTo) { - this.identifier = Preconditions.checkNotNull(identifier); - this.data = Preconditions.checkNotNull(data); + MessageSlice(final Identifier identifier, final byte[] data, final int sliceIndex, final int totalSlices, + final int lastSliceHashCode, final ActorRef replyTo) { + this.identifier = requireNonNull(identifier); + this.data = requireNonNull(data); this.sliceIndex = sliceIndex; this.totalSlices = totalSlices; this.lastSliceHashCode = lastSliceHashCode; - this.replyTo = Preconditions.checkNotNull(replyTo); + this.replyTo = requireNonNull(replyTo); } public Identifier getIdentifier() { @@ -93,12 +94,12 @@ public class MessageSlice implements Serializable { public Proxy() { } - Proxy(MessageSlice messageSlice) { + Proxy(final MessageSlice messageSlice) { this.messageSlice = messageSlice; } @Override - public void writeExternal(ObjectOutput out) throws IOException { + public void writeExternal(final ObjectOutput out) throws IOException { out.writeObject(messageSlice.identifier); out.writeInt(messageSlice.sliceIndex); out.writeInt(messageSlice.totalSlices); @@ -108,7 +109,7 @@ public class MessageSlice implements Serializable { } @Override - public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { + public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException { Identifier identifier = (Identifier) in.readObject(); int sliceIndex = in.readInt(); int totalSlices = in.readInt(); diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/messaging/MessageSliceIdentifier.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/messaging/MessageSliceIdentifier.java index f81cbb00a1..0cc36689bb 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/messaging/MessageSliceIdentifier.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/messaging/MessageSliceIdentifier.java @@ -7,7 +7,8 @@ */ package org.opendaylight.controller.cluster.messaging; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import java.io.Externalizable; import java.io.IOException; import java.io.ObjectInput; @@ -34,7 +35,7 @@ final class MessageSliceIdentifier implements Identifier { } private MessageSliceIdentifier(final Identifier clientIdentifier, final long slicerId, final long messageId) { - this.clientIdentifier = Preconditions.checkNotNull(clientIdentifier); + this.clientIdentifier = requireNonNull(clientIdentifier); this.messageId = messageId; this.slicerId = slicerId; } @@ -58,7 +59,7 @@ final class MessageSliceIdentifier implements Identifier { } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { if (this == obj) { return true; } @@ -93,18 +94,18 @@ final class MessageSliceIdentifier implements Identifier { public Proxy() { } - Proxy(MessageSliceIdentifier messageSliceId) { + Proxy(final MessageSliceIdentifier messageSliceId) { this.messageSliceId = messageSliceId; } @Override - public void writeExternal(ObjectOutput out) throws IOException { + public void writeExternal(final ObjectOutput out) throws IOException { out.writeObject(messageSliceId.clientIdentifier); WritableObjects.writeLongs(out, messageSliceId.slicerId, messageSliceId.messageId); } @Override - public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { + public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException { final Identifier clientIdentifier = (Identifier) in.readObject(); final byte header = WritableObjects.readLongHeader(in); final long slicerId = WritableObjects.readFirstLong(in, header); diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/messaging/MessageSliceReply.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/messaging/MessageSliceReply.java index bfcfdede85..e820c4ba3f 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/messaging/MessageSliceReply.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/messaging/MessageSliceReply.java @@ -7,10 +7,11 @@ */ package org.opendaylight.controller.cluster.messaging; +import static java.util.Objects.requireNonNull; + import akka.actor.ActorRef; import akka.serialization.JavaSerializer; import akka.serialization.Serialization; -import com.google.common.base.Preconditions; import java.io.Externalizable; import java.io.IOException; import java.io.ObjectInput; @@ -34,9 +35,9 @@ public final class MessageSliceReply implements Serializable { private MessageSliceReply(final Identifier identifier, final int sliceIndex, final MessageSliceException failure, final ActorRef sendTo) { - this.identifier = Preconditions.checkNotNull(identifier); + this.identifier = requireNonNull(identifier); this.sliceIndex = sliceIndex; - this.sendTo = Preconditions.checkNotNull(sendTo); + this.sendTo = requireNonNull(sendTo); this.failure = failure; } diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/messaging/SliceOptions.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/messaging/SliceOptions.java index 6bae647cb7..9ba69fb655 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/messaging/SliceOptions.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/messaging/SliceOptions.java @@ -7,9 +7,11 @@ */ package org.opendaylight.controller.cluster.messaging; +import static com.google.common.base.Preconditions.checkState; +import static java.util.Objects.requireNonNull; + import akka.actor.ActorRef; import akka.actor.ActorSelection; -import com.google.common.base.Preconditions; import java.io.Serializable; import java.util.function.Consumer; import org.opendaylight.controller.cluster.io.FileBackedOutputStream; @@ -174,23 +176,23 @@ public final class SliceOptions { public SliceOptions build() { sealed = true; - Preconditions.checkNotNull(identifier, "identifier must be set"); - Preconditions.checkNotNull(replyTo, "replyTo must be set"); - Preconditions.checkNotNull(onFailureCallback, "onFailureCallback must be set"); - Preconditions.checkState(fileBackedStream == null || message == null, + requireNonNull(identifier, "identifier must be set"); + requireNonNull(replyTo, "replyTo must be set"); + requireNonNull(onFailureCallback, "onFailureCallback must be set"); + checkState(fileBackedStream == null || message == null, "Only one of message and fileBackedStream can be set"); - Preconditions.checkState(!(fileBackedStream == null && message == null), + checkState(!(fileBackedStream == null && message == null), "One of message and fileBackedStream must be set"); - Preconditions.checkState(sendToRef == null || sendToSelection == null, + checkState(sendToRef == null || sendToSelection == null, "Only one of sendToRef and sendToSelection can be set"); - Preconditions.checkState(!(sendToRef == null && sendToSelection == null), + checkState(!(sendToRef == null && sendToSelection == null), "One of sendToRef and sendToSelection must be set"); return new SliceOptions(this); } protected void checkSealed() { - Preconditions.checkState(!sealed, "Builder is already sealed - further modifications are not allowed"); + checkState(!sealed, "Builder is already sealed - further modifications are not allowed"); } } } diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/notifications/RoleChangeNotifier.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/notifications/RoleChangeNotifier.java index 89f9dd12e0..bb4ad65f16 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/notifications/RoleChangeNotifier.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/notifications/RoleChangeNotifier.java @@ -5,14 +5,13 @@ * 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.notifications; import akka.actor.ActorPath; import akka.actor.ActorRef; import akka.actor.Props; import akka.serialization.Serialization; -import com.google.common.collect.Maps; +import java.util.HashMap; import java.util.Map; import org.opendaylight.controller.cluster.common.actor.AbstractUntypedActor; @@ -26,11 +25,11 @@ import org.opendaylight.controller.cluster.common.actor.AbstractUntypedActor; public class RoleChangeNotifier extends AbstractUntypedActor implements AutoCloseable { private final String memberId; - private final Map registeredListeners = Maps.newHashMap(); + private final Map registeredListeners = new HashMap<>(); private RoleChangeNotification latestRoleChangeNotification = null; private LeaderStateChanged latestLeaderStateChanged; - public RoleChangeNotifier(String memberId) { + public RoleChangeNotifier(final String memberId) { this.memberId = memberId; } @@ -46,7 +45,7 @@ public class RoleChangeNotifier extends AbstractUntypedActor implements AutoClos } @Override - protected void handleReceive(Object message) { + protected void handleReceive(final Object message) { if (message instanceof RegisterRoleChangeListener) { // register listeners for this shard diff --git a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataValidationFailedException.java b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataValidationFailedException.java index bc393dde4f..38ef5d8ff4 100644 --- a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataValidationFailedException.java +++ b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/DataValidationFailedException.java @@ -7,7 +7,8 @@ */ package org.opendaylight.controller.md.sal.common.api.data; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import org.opendaylight.yangtools.concepts.Path; import org.opendaylight.yangtools.yang.common.RpcError.ErrorType; @@ -41,12 +42,12 @@ public class DataValidationFailedException extends TransactionCommitFailedExcept final String message, final Throwable cause) { super(message, cause, RpcResultBuilder.newError(ErrorType.APPLICATION, "invalid-value", message, null, path != null ? path.toString() : null, cause)); - this.pathType = Preconditions.checkNotNull(pathType, "path type must not be null"); - this.path = Preconditions.checkNotNull(path,"path must not be null."); + this.pathType = requireNonNull(pathType, "path type must not be null"); + this.path = requireNonNull(path,"path must not be null."); } - public

> DataValidationFailedException(final Class

pathType,final P path, - final String message) { + public

> DataValidationFailedException(final Class

pathType,final P path, + final String message) { this(pathType, path, message, null); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractDOMBrokerWriteTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractDOMBrokerWriteTransaction.java index 1d661eb32a..2e66571cea 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractDOMBrokerWriteTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractDOMBrokerWriteTransaction.java @@ -5,11 +5,13 @@ * 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.checkArgument; +import static com.google.common.base.Preconditions.checkState; +import static java.util.Objects.requireNonNull; + import com.google.common.base.MoreObjects.ToStringHelper; -import com.google.common.base.Preconditions; import com.google.common.util.concurrent.FluentFuture; import com.google.common.util.concurrent.Futures; import java.util.ArrayList; @@ -67,7 +69,7 @@ public abstract class AbstractDOMBrokerWriteTransaction storeTxFactories, final AbstractDOMTransactionFactory commitImpl) { super(identifier, storeTxFactories); - this.commitImpl = Preconditions.checkNotNull(commitImpl, "commitImpl must not be null."); + this.commitImpl = requireNonNull(commitImpl, "commitImpl must not be null."); } @Override @@ -80,10 +82,9 @@ public abstract class AbstractDOMBrokerWriteTransaction data) { - Preconditions.checkArgument(data != null, "Attempted to store null data at %s", path); + checkArgument(data != null, "Attempted to store null data at %s", path); final PathArgument lastArg = path.getLastPathArgument(); - Preconditions.checkArgument( - lastArg == data.getIdentifier() || lastArg != null && lastArg.equals(data.getIdentifier()), + checkArgument(lastArg == data.getIdentifier() || lastArg != null && lastArg.equals(data.getIdentifier()), "Instance identifier references %s but data identifier is %s", lastArg, data); } @@ -147,7 +148,7 @@ public abstract class AbstractDOMBrokerWriteTransaction impl) { - Preconditions.checkState(impl != null, "Transaction %s is no longer running", getIdentifier()); + checkState(impl != null, "Transaction %s is no longer running", getIdentifier()); } @Override diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractShardedTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractShardedTransaction.java index ea6948f859..9ee43f20bb 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractShardedTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractShardedTransaction.java @@ -7,7 +7,8 @@ */ package org.opendaylight.controller.cluster.databroker; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import org.opendaylight.controller.cluster.databroker.actors.dds.ClientTransaction; import org.opendaylight.mdsal.dom.spi.store.DOMStoreTransaction; @@ -22,7 +23,7 @@ abstract class AbstractShardedTransaction implements DOMStoreTransaction { private final ClientTransaction tx; AbstractShardedTransaction(final ClientTransaction tx) { - this.tx = Preconditions.checkNotNull(tx); + this.tx = requireNonNull(tx); } @Override diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/ConcurrentDOMDataBroker.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/ConcurrentDOMDataBroker.java index 1199fbf7bc..cdcae3ddff 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/ConcurrentDOMDataBroker.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/ConcurrentDOMDataBroker.java @@ -7,12 +7,13 @@ */ package org.opendaylight.controller.cluster.databroker; +import static com.google.common.base.Preconditions.checkArgument; +import static java.util.Objects.requireNonNull; import static org.opendaylight.mdsal.dom.broker.TransactionCommitFailedExceptionMapper.CAN_COMMIT_ERROR_MAPPER; import static org.opendaylight.mdsal.dom.broker.TransactionCommitFailedExceptionMapper.COMMIT_ERROR_MAPPER; import static org.opendaylight.mdsal.dom.broker.TransactionCommitFailedExceptionMapper.PRE_COMMIT_MAPPER; import com.google.common.annotations.Beta; -import com.google.common.base.Preconditions; import com.google.common.util.concurrent.AbstractFuture; import com.google.common.util.concurrent.FluentFuture; import com.google.common.util.concurrent.FutureCallback; @@ -68,8 +69,8 @@ public class ConcurrentDOMDataBroker extends AbstractDOMBroker { public ConcurrentDOMDataBroker(final Map datastores, final Executor listenableFutureExecutor, final DurationStatisticsTracker commitStatsTracker) { super(datastores); - this.clientFutureCallbackExecutor = Preconditions.checkNotNull(listenableFutureExecutor); - this.commitStatsTracker = Preconditions.checkNotNull(commitStatsTracker); + this.clientFutureCallbackExecutor = requireNonNull(listenableFutureExecutor); + this.commitStatsTracker = requireNonNull(commitStatsTracker); } public DurationStatisticsTracker getCommitStatsTracker() { @@ -77,11 +78,11 @@ public class ConcurrentDOMDataBroker extends AbstractDOMBroker { } @Override - protected FluentFuture commit( - final DOMDataTreeWriteTransaction transaction, final Collection cohorts) { + protected FluentFuture commit(final DOMDataTreeWriteTransaction transaction, + final Collection cohorts) { - Preconditions.checkArgument(transaction != null, "Transaction must not be null."); - Preconditions.checkArgument(cohorts != null, "Cohorts must not be null."); + checkArgument(transaction != null, "Transaction must not be null."); + checkArgument(cohorts != null, "Cohorts must not be null."); LOG.debug("Tx: {} is submitted for execution.", transaction.getIdentifier()); if (cohorts.isEmpty()) { @@ -262,7 +263,7 @@ public class ConcurrentDOMDataBroker extends AbstractDOMBroker { private final Executor listenerExecutor; AsyncNotifyingSettableFuture(final Executor listenerExecutor) { - this.listenerExecutor = Preconditions.checkNotNull(listenerExecutor); + this.listenerExecutor = requireNonNull(listenerExecutor); } @Override @@ -303,8 +304,8 @@ public class ConcurrentDOMDataBroker extends AbstractDOMBroker { private final Executor executor; DelegatingRunnable(final Runnable delegate, final Executor executor) { - this.delegate = Preconditions.checkNotNull(delegate); - this.executor = Preconditions.checkNotNull(executor); + this.delegate = requireNonNull(delegate); + this.executor = requireNonNull(executor); } @Override diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/DOMBrokerTransactionChain.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/DOMBrokerTransactionChain.java index 1f1ea7fd92..537aa46a82 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/DOMBrokerTransactionChain.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/DOMBrokerTransactionChain.java @@ -8,7 +8,9 @@ package org.opendaylight.controller.cluster.databroker; -import com.google.common.base.Preconditions; +import static com.google.common.base.Preconditions.checkState; +import static java.util.Objects.requireNonNull; + import com.google.common.util.concurrent.FluentFuture; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.MoreExecutors; @@ -65,12 +67,12 @@ final class DOMBrokerTransactionChain extends AbstractDOMTransactionFactory e // Hidden to prevent outside instantiation AbstractClientHandle(final AbstractClientHistory parent, final TransactionIdentifier transactionId) { - this.transactionId = Preconditions.checkNotNull(transactionId); - this.parent = Preconditions.checkNotNull(parent); + this.transactionId = requireNonNull(transactionId); + this.parent = requireNonNull(parent); } @Override @@ -114,7 +116,7 @@ public abstract class AbstractClientHandle e private State getState() { final State local = state; - Preconditions.checkState(local != null, "Transaction %s is closed", transactionId); + checkState(local != null, "Transaction %s is closed", transactionId); return local; } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractTransactionCommitCohort.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractTransactionCommitCohort.java index 789309cf8a..b2f66d5d31 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractTransactionCommitCohort.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractTransactionCommitCohort.java @@ -7,8 +7,9 @@ */ package org.opendaylight.controller.cluster.databroker.actors.dds; +import static java.util.Objects.requireNonNull; + import com.google.common.base.MoreObjects; -import com.google.common.base.Preconditions; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; @@ -28,8 +29,8 @@ abstract class AbstractTransactionCommitCohort implements DOMStoreThreePhaseComm private final TransactionIdentifier txId; AbstractTransactionCommitCohort(final AbstractClientHistory parent, final TransactionIdentifier txId) { - this.parent = Preconditions.checkNotNull(parent); - this.txId = Preconditions.checkNotNull(txId); + this.parent = requireNonNull(parent); + this.txId = requireNonNull(txId); } final void complete() { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/BouncingReconnectForwarder.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/BouncingReconnectForwarder.java index 26e346e77c..52bf1d930f 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/BouncingReconnectForwarder.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/BouncingReconnectForwarder.java @@ -7,7 +7,8 @@ */ package org.opendaylight.controller.cluster.databroker.actors.dds; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import com.google.common.collect.Collections2; import com.google.common.collect.Maps; import java.util.Collection; @@ -46,7 +47,7 @@ final class BouncingReconnectForwarder extends ReconnectForwarder { private BouncingReconnectForwarder(final ConnectedClientConnection successor, final Map cohorts) { super(successor); - this.cohorts = Preconditions.checkNotNull(cohorts); + this.cohorts = requireNonNull(cohorts); } static ReconnectForwarder forCohorts(final ConnectedClientConnection successor, diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientTransactionCursor.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientTransactionCursor.java index 41d2cb8cd1..933d4bb47b 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientTransactionCursor.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/ClientTransactionCursor.java @@ -7,7 +7,9 @@ */ package org.opendaylight.controller.cluster.databroker.actors.dds; -import com.google.common.base.Preconditions; +import static com.google.common.base.Preconditions.checkState; +import static java.util.Objects.requireNonNull; + import java.util.Arrays; import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteCursor; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; @@ -24,7 +26,7 @@ final class ClientTransactionCursor implements DOMDataTreeWriteCursor { private final ClientTransaction parent; ClientTransactionCursor(final ClientTransaction parent) { - this.parent = Preconditions.checkNotNull(parent); + this.parent = requireNonNull(parent); } @Override @@ -45,7 +47,7 @@ final class ClientTransactionCursor implements DOMDataTreeWriteCursor { @Override public void exit() { final YangInstanceIdentifier currentParent = current.getParent(); - Preconditions.checkState(currentParent != null); + checkState(currentParent != null); current = currentParent; } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/DirectTransactionCommitCohort.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/DirectTransactionCommitCohort.java index 1d5d4a70de..9b21b98682 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/DirectTransactionCommitCohort.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/DirectTransactionCommitCohort.java @@ -7,7 +7,8 @@ */ package org.opendaylight.controller.cluster.databroker.actors.dds; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import com.google.common.util.concurrent.ListenableFuture; import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; @@ -23,7 +24,7 @@ final class DirectTransactionCommitCohort extends AbstractTransactionCommitCohor DirectTransactionCommitCohort(final AbstractClientHistory parent, final TransactionIdentifier txId, final AbstractProxyTransaction proxy) { super(parent, txId); - this.proxy = Preconditions.checkNotNull(proxy); + this.proxy = requireNonNull(proxy); } @Override diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/GetClientRequest.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/GetClientRequest.java index db91424747..7d9d74d8ea 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/GetClientRequest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/GetClientRequest.java @@ -7,8 +7,9 @@ */ package org.opendaylight.controller.cluster.databroker.actors.dds; +import static java.util.Objects.requireNonNull; + import akka.actor.ActorRef; -import com.google.common.base.Preconditions; /** * Request the ClientIdentifier from a particular actor. Response is an instance of {@link DataStoreClient}. @@ -19,7 +20,7 @@ final class GetClientRequest { private final ActorRef replyTo; GetClientRequest(final ActorRef replyTo) { - this.replyTo = Preconditions.checkNotNull(replyTo); + this.replyTo = requireNonNull(replyTo); } ActorRef getReplyTo() { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/LocalProxyTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/LocalProxyTransaction.java index 143cc8bf60..6edbf6ca0d 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/LocalProxyTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/LocalProxyTransaction.java @@ -9,7 +9,6 @@ package org.opendaylight.controller.cluster.databroker.actors.dds; import static java.util.Objects.requireNonNull; -import com.google.common.base.Preconditions; import com.google.common.util.concurrent.FluentFuture; import java.util.Optional; import java.util.function.Consumer; @@ -109,7 +108,7 @@ abstract class LocalProxyTransaction extends AbstractProxyTransaction { final Optional> result = readOnlyView().readNode(path); if (callback != null) { // XXX: FB does not see that callback is final, on stack and has be check for non-null. - final Consumer> fbIsStupid = Preconditions.checkNotNull(callback); + final Consumer> fbIsStupid = requireNonNull(callback); executeInActor(() -> fbIsStupid.accept(new ReadTransactionSuccess(request.getTarget(), request.getSequence(), result))); } @@ -119,7 +118,7 @@ abstract class LocalProxyTransaction extends AbstractProxyTransaction { final boolean result = readOnlyView().readNode(path).isPresent(); if (callback != null) { // XXX: FB does not see that callback is final, on stack and has be check for non-null. - final Consumer> fbIsStupid = Preconditions.checkNotNull(callback); + final Consumer> fbIsStupid = requireNonNull(callback); executeInActor(() -> fbIsStupid.accept(new ExistsTransactionSuccess(request.getTarget(), request.getSequence(), result))); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractFrontendHistory.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractFrontendHistory.java index e136d50e02..01fc35c395 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractFrontendHistory.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractFrontendHistory.java @@ -7,8 +7,9 @@ */ package org.opendaylight.controller.cluster.datastore; +import static java.util.Objects.requireNonNull; + import com.google.common.base.MoreObjects; -import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Range; import com.google.common.collect.RangeSet; @@ -60,10 +61,10 @@ abstract class AbstractFrontendHistory implements Identifiable closedTransactions, final RangeSet purgedTransactions) { - this.persistenceId = Preconditions.checkNotNull(persistenceId); - this.tree = Preconditions.checkNotNull(tree); - this.closedTransactions = Preconditions.checkNotNull(closedTransactions); - this.purgedTransactions = Preconditions.checkNotNull(purgedTransactions); + this.persistenceId = requireNonNull(persistenceId); + this.tree = requireNonNull(tree); + this.closedTransactions = requireNonNull(closedTransactions); + this.purgedTransactions = requireNonNull(purgedTransactions); } final String persistenceId() { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractShardDataTreeTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractShardDataTreeTransaction.java index 9412d47b51..bec1a38f24 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractShardDataTreeTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/AbstractShardDataTreeTransaction.java @@ -7,8 +7,10 @@ */ package org.opendaylight.controller.cluster.datastore; +import static com.google.common.base.Preconditions.checkState; +import static java.util.Objects.requireNonNull; + import com.google.common.base.MoreObjects; -import com.google.common.base.Preconditions; import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; import org.opendaylight.controller.cluster.datastore.persisted.AbortTransactionPayload; import org.opendaylight.yangtools.concepts.Identifiable; @@ -29,9 +31,9 @@ abstract class AbstractShardDataTreeTransaction AbstractShardDataTreeTransaction(final ShardDataTreeTransactionParent parent, final TransactionIdentifier id, final T snapshot) { - this.parent = Preconditions.checkNotNull(parent); - this.snapshot = Preconditions.checkNotNull(snapshot); - this.id = Preconditions.checkNotNull(id); + this.parent = requireNonNull(parent); + this.snapshot = requireNonNull(snapshot); + this.id = requireNonNull(id); } @Override @@ -66,7 +68,7 @@ abstract class AbstractShardDataTreeTransaction } final void abort(final Runnable callback) { - Preconditions.checkState(close(), "Transaction is already closed"); + checkState(close(), "Transaction is already closed"); parent.abortTransaction(this, callback); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ChainedCommitCohort.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ChainedCommitCohort.java index 2cb4dee374..1f87fd4259 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ChainedCommitCohort.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ChainedCommitCohort.java @@ -7,7 +7,8 @@ */ package org.opendaylight.controller.cluster.datastore; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import com.google.common.primitives.UnsignedLong; import com.google.common.util.concurrent.FutureCallback; import java.util.Optional; @@ -27,9 +28,9 @@ final class ChainedCommitCohort extends ShardDataTreeCohort { ChainedCommitCohort(final ShardDataTreeTransactionChain chain, final ReadWriteShardDataTreeTransaction transaction, final ShardDataTreeCohort delegate) { - this.transaction = Preconditions.checkNotNull(transaction); - this.delegate = Preconditions.checkNotNull(delegate); - this.chain = Preconditions.checkNotNull(chain); + this.transaction = requireNonNull(transaction); + this.delegate = requireNonNull(delegate); + this.chain = requireNonNull(chain); } @Override diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ClusterWrapperImpl.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ClusterWrapperImpl.java index 38d23f6884..be162d9304 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ClusterWrapperImpl.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ClusterWrapperImpl.java @@ -5,15 +5,16 @@ * 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.datastore; +import static com.google.common.base.Preconditions.checkState; +import static java.util.Objects.requireNonNull; + import akka.actor.ActorRef; import akka.actor.ActorSystem; import akka.actor.Address; import akka.cluster.Cluster; import akka.cluster.ClusterEvent; -import com.google.common.base.Preconditions; import org.opendaylight.controller.cluster.access.concepts.MemberName; public class ClusterWrapperImpl implements ClusterWrapper { @@ -21,12 +22,10 @@ public class ClusterWrapperImpl implements ClusterWrapper { private final MemberName currentMemberName; private final Address selfAddress; - public ClusterWrapperImpl(ActorSystem actorSystem) { - Preconditions.checkNotNull(actorSystem, "actorSystem should not be null"); + public ClusterWrapperImpl(final ActorSystem actorSystem) { + cluster = Cluster.get(requireNonNull(actorSystem, "actorSystem should not be null")); - cluster = Cluster.get(actorSystem); - - Preconditions.checkState(cluster.getSelfRoles().size() > 0, + checkState(cluster.getSelfRoles().size() > 0, "No akka roles were specified.\n" + "One way to specify the member name is to pass a property on the command line like so\n" + " -Dakka.cluster.roles.0=member-3\n" @@ -37,10 +36,8 @@ public class ClusterWrapperImpl implements ClusterWrapper { } @Override - public void subscribeToMemberEvents(ActorRef actorRef) { - Preconditions.checkNotNull(actorRef, "actorRef should not be null"); - - cluster.subscribe(actorRef, ClusterEvent.initialStateAsEvents(), + public void subscribeToMemberEvents(final ActorRef actorRef) { + cluster.subscribe(requireNonNull(actorRef, "actorRef should not be null"), ClusterEvent.initialStateAsEvents(), ClusterEvent.MemberEvent.class, ClusterEvent.UnreachableMember.class, ClusterEvent.ReachableMember.class); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/CohortEntry.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/CohortEntry.java index 80ba952abb..6c0c13b3ab 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/CohortEntry.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/CohortEntry.java @@ -7,8 +7,10 @@ */ package org.opendaylight.controller.cluster.datastore; +import static com.google.common.base.Preconditions.checkState; +import static java.util.Objects.requireNonNull; + import akka.actor.ActorRef; -import com.google.common.base.Preconditions; import com.google.common.primitives.UnsignedLong; import com.google.common.util.concurrent.FutureCallback; import java.util.List; @@ -35,13 +37,13 @@ final class CohortEntry { private CohortEntry(final ReadWriteShardDataTreeTransaction transaction, final short clientVersion) { this.cohort = null; - this.transaction = Preconditions.checkNotNull(transaction); + this.transaction = requireNonNull(transaction); this.transactionId = transaction.getIdentifier(); this.clientVersion = clientVersion; } private CohortEntry(final ShardDataTreeCohort cohort, final short clientVersion) { - this.cohort = Preconditions.checkNotNull(cohort); + this.cohort = requireNonNull(cohort); this.transactionId = cohort.getIdentifier(); this.transaction = null; this.clientVersion = clientVersion; @@ -120,7 +122,7 @@ final class CohortEntry { } void ready(final Optional> participatingShardNames, final CohortDecorator cohortDecorator) { - Preconditions.checkState(cohort == null, "cohort was already set"); + checkState(cohort == null, "cohort was already set"); cohort = transaction.ready(participatingShardNames); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/CompositeDataTreeCohort.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/CompositeDataTreeCohort.java index 5e1add10a2..9a238e9d50 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/CompositeDataTreeCohort.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/CompositeDataTreeCohort.java @@ -5,9 +5,11 @@ * 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.datastore; +import static com.google.common.base.Preconditions.checkState; +import static java.util.Objects.requireNonNull; + import akka.actor.ActorRef; import akka.actor.Status; import akka.actor.Status.Failure; @@ -17,7 +19,6 @@ import akka.dispatch.OnComplete; import akka.dispatch.Recover; import akka.pattern.Patterns; import akka.util.Timeout; -import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.AbstractMap.SimpleImmutableEntry; @@ -109,11 +110,11 @@ class CompositeDataTreeCohort { CompositeDataTreeCohort(final DataTreeCohortActorRegistry registry, final TransactionIdentifier transactionID, final SchemaContext schema, final Executor callbackExecutor, final Timeout timeout) { - this.registry = Preconditions.checkNotNull(registry); - this.txId = Preconditions.checkNotNull(transactionID); - this.schema = Preconditions.checkNotNull(schema); - this.callbackExecutor = Preconditions.checkNotNull(callbackExecutor); - this.timeout = Preconditions.checkNotNull(timeout); + this.registry = requireNonNull(registry); + this.txId = requireNonNull(transactionID); + this.schema = requireNonNull(schema); + this.callbackExecutor = requireNonNull(callbackExecutor); + this.timeout = requireNonNull(timeout); } void reset() { @@ -282,7 +283,7 @@ class CompositeDataTreeCohort { } void changeStateFrom(final State expected, final State followup) { - Preconditions.checkState(state == expected); + checkState(state == expected); state = followup; } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DOMDataTreeCandidateTO.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DOMDataTreeCandidateTO.java index 7e79c3e88a..a8a0124fcd 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DOMDataTreeCandidateTO.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DOMDataTreeCandidateTO.java @@ -5,11 +5,11 @@ * 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.datastore; +import static java.util.Objects.requireNonNull; + import com.google.common.base.MoreObjects; -import com.google.common.base.Preconditions; import org.opendaylight.mdsal.dom.api.DOMDataTreeCandidate; import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidateNode; @@ -19,9 +19,9 @@ final class DOMDataTreeCandidateTO implements DOMDataTreeCandidate { private final DOMDataTreeIdentifier rootPath; private final DataTreeCandidateNode rootNode; - private DOMDataTreeCandidateTO(DOMDataTreeIdentifier rootPath, DataTreeCandidateNode rootNode) { - this.rootPath = Preconditions.checkNotNull(rootPath); - this.rootNode = Preconditions.checkNotNull(rootNode); + private DOMDataTreeCandidateTO(final DOMDataTreeIdentifier rootPath, final DataTreeCandidateNode rootNode) { + this.rootPath = requireNonNull(rootPath); + this.rootNode = requireNonNull(rootNode); } @Override @@ -34,7 +34,7 @@ final class DOMDataTreeCandidateTO implements DOMDataTreeCandidate { return rootNode; } - static DOMDataTreeCandidate create(DOMDataTreeIdentifier path, DataTreeCandidateNode node) { + static DOMDataTreeCandidate create(final DOMDataTreeIdentifier path, final DataTreeCandidateNode node) { return new DOMDataTreeCandidateTO(path, node); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeChangeListenerActor.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeChangeListenerActor.java index c72de945b1..8df53b276a 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeChangeListenerActor.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeChangeListenerActor.java @@ -7,8 +7,9 @@ */ package org.opendaylight.controller.cluster.datastore; +import static java.util.Objects.requireNonNull; + import akka.actor.Props; -import com.google.common.base.Preconditions; import org.opendaylight.controller.cluster.common.actor.AbstractUntypedActor; import org.opendaylight.controller.cluster.datastore.messages.DataTreeChanged; import org.opendaylight.controller.cluster.datastore.messages.DataTreeChangedReply; @@ -32,8 +33,8 @@ final class DataTreeChangeListenerActor extends AbstractUntypedActor { private DataTreeChangeListenerActor(final DOMDataTreeChangeListener listener, final YangInstanceIdentifier registeredPath) { - this.listener = Preconditions.checkNotNull(listener); - this.registeredPath = Preconditions.checkNotNull(registeredPath); + this.listener = requireNonNull(listener); + this.registeredPath = requireNonNull(registeredPath); } @Override diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortActorRegistry.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortActorRegistry.java index 2859671ac6..3ff6a9f0e6 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortActorRegistry.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortActorRegistry.java @@ -5,14 +5,14 @@ * 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.datastore; +import static java.util.Objects.requireNonNull; + import akka.actor.ActorRef; import akka.actor.PoisonPill; import akka.actor.Status; import akka.util.Timeout; -import com.google.common.base.Preconditions; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; import java.util.ArrayList; @@ -97,11 +97,10 @@ class DataTreeCohortActorRegistry extends AbstractRegistrationTree { } abstract static class CohortRegistryCommand { - private final ActorRef cohort; CohortRegistryCommand(final ActorRef cohort) { - this.cohort = Preconditions.checkNotNull(cohort); + this.cohort = requireNonNull(cohort); } ActorRef getCohort() { @@ -110,40 +109,34 @@ class DataTreeCohortActorRegistry extends AbstractRegistrationTree { } static class RegisterCohort extends CohortRegistryCommand { - private final DOMDataTreeIdentifier path; RegisterCohort(final DOMDataTreeIdentifier path, final ActorRef cohort) { super(cohort); this.path = path; - } public DOMDataTreeIdentifier getPath() { return path; } - } static class RemoveCohort extends CohortRegistryCommand { - RemoveCohort(final ActorRef cohort) { super(cohort); } - } private static class CanCommitMessageBuilder { - + private final Multimap actorToCandidates = ArrayListMultimap.create(); private final TransactionIdentifier txId; private final DataTreeCandidate candidate; private final SchemaContext schema; - private final Multimap actorToCandidates = ArrayListMultimap.create(); CanCommitMessageBuilder(final TransactionIdentifier txId, final DataTreeCandidate candidate, final SchemaContext schema) { - this.txId = Preconditions.checkNotNull(txId); - this.candidate = Preconditions.checkNotNull(candidate); + this.txId = requireNonNull(txId); + this.candidate = requireNonNull(candidate); this.schema = schema; } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContext.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContext.java index 1a46e3d452..7d3d1b1089 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContext.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContext.java @@ -7,9 +7,11 @@ */ package org.opendaylight.controller.cluster.datastore; +import static com.google.common.base.Preconditions.checkArgument; +import static java.util.Objects.requireNonNull; + import akka.util.Timeout; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Preconditions; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; @@ -280,8 +282,7 @@ public class DatastoreContext implements ClientActorConfig { } private void setSnapshotDataThresholdPercentage(final int shardSnapshotDataThresholdPercentage) { - Preconditions.checkArgument(shardSnapshotDataThresholdPercentage >= 0 - && shardSnapshotDataThresholdPercentage <= 100); + checkArgument(shardSnapshotDataThresholdPercentage >= 0 && shardSnapshotDataThresholdPercentage <= 100); raftConfig.setSnapshotDataThresholdPercentage(shardSnapshotDataThresholdPercentage); } @@ -491,7 +492,7 @@ public class DatastoreContext implements ClientActorConfig { } public Builder logicalStoreType(final LogicalDatastoreType logicalStoreType) { - datastoreContext.logicalStoreType = Preconditions.checkNotNull(logicalStoreType); + datastoreContext.logicalStoreType = requireNonNull(logicalStoreType); // Retain compatible naming switch (logicalStoreType) { @@ -514,7 +515,7 @@ public class DatastoreContext implements ClientActorConfig { } public Builder dataStoreName(final String dataStoreName) { - datastoreContext.dataStoreName = Preconditions.checkNotNull(dataStoreName); + datastoreContext.dataStoreName = requireNonNull(dataStoreName); datastoreContext.dataStoreMXBeanType = "Distributed" + WordUtils.capitalize(dataStoreName) + "Datastore"; return this; } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreSnapshotRestore.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreSnapshotRestore.java index db9acaebcd..995401c82c 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreSnapshotRestore.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreSnapshotRestore.java @@ -7,7 +7,8 @@ */ package org.opendaylight.controller.cluster.datastore; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -41,7 +42,7 @@ public final class DatastoreSnapshotRestore { } private DatastoreSnapshotRestore(final String restoreDirectoryPath) { - this.restoreDirectoryPath = Preconditions.checkNotNull(restoreDirectoryPath); + this.restoreDirectoryPath = requireNonNull(restoreDirectoryPath); } // synchronize this method so that, in case of concurrent access to getAndRemove(), diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DebugThreePhaseCommitCohort.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DebugThreePhaseCommitCohort.java index 9f9d169d1a..afb5773f43 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DebugThreePhaseCommitCohort.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DebugThreePhaseCommitCohort.java @@ -7,8 +7,9 @@ */ package org.opendaylight.controller.cluster.datastore; +import static java.util.Objects.requireNonNull; + import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Preconditions; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; @@ -38,9 +39,9 @@ class DebugThreePhaseCommitCohort extends AbstractThreePhaseCommitCohort DebugThreePhaseCommitCohort(final TransactionIdentifier transactionId, final AbstractThreePhaseCommitCohort delegate, final Throwable debugContext) { - this.delegate = Preconditions.checkNotNull(delegate); - this.debugContext = Preconditions.checkNotNull(debugContext); - this.transactionId = Preconditions.checkNotNull(transactionId); + this.delegate = requireNonNull(delegate); + this.debugContext = requireNonNull(debugContext); + this.transactionId = requireNonNull(transactionId); } private ListenableFuture addFutureCallback(final ListenableFuture future) { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ForwardingDataTreeChangeListener.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ForwardingDataTreeChangeListener.java index 41427608e4..73b56239a0 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ForwardingDataTreeChangeListener.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ForwardingDataTreeChangeListener.java @@ -7,9 +7,10 @@ */ package org.opendaylight.controller.cluster.datastore; +import static java.util.Objects.requireNonNull; + import akka.actor.ActorRef; import akka.actor.ActorSelection; -import com.google.common.base.Preconditions; import java.util.Collection; import org.opendaylight.controller.cluster.datastore.messages.DataTreeChanged; import org.opendaylight.controller.cluster.datastore.messages.OnInitialData; @@ -29,11 +30,11 @@ final class ForwardingDataTreeChangeListener implements DOMDataTreeChangeListene private final ActorSelection actor; ForwardingDataTreeChangeListener(final ActorSelection actor) { - this.actor = Preconditions.checkNotNull(actor, "actor should not be null"); + this.actor = requireNonNull(actor, "actor should not be null"); } @Override - public void onDataTreeChanged(Collection changes) { + public void onDataTreeChanged(final Collection changes) { LOG.debug("Sending DataTreeChanged to {}", actor); actor.tell(new DataTreeChanged(changes), ActorRef.noSender()); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/FrontendHistoryMetadataBuilder.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/FrontendHistoryMetadataBuilder.java index db0fcf5790..eedabddf80 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/FrontendHistoryMetadataBuilder.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/FrontendHistoryMetadataBuilder.java @@ -7,7 +7,9 @@ */ package org.opendaylight.controller.cluster.datastore; -import com.google.common.base.Preconditions; +import static com.google.common.base.Preconditions.checkState; +import static java.util.Objects.requireNonNull; + import com.google.common.collect.Range; import com.google.common.collect.RangeSet; import com.google.common.collect.TreeRangeSet; @@ -32,7 +34,7 @@ final class FrontendHistoryMetadataBuilder implements Builder(2); } @@ -56,7 +58,7 @@ final class FrontendHistoryMetadataBuilder implements Builder { private final Shard shard; protected LeaderLocalDelegateFactory(final Shard shard) { - this.shard = Preconditions.checkNotNull(shard); + this.shard = requireNonNull(shard); } protected final ActorRef getSelf() { @@ -47,11 +48,11 @@ abstract class LeaderLocalDelegateFactory { return shard.getContext().actorOf(props); } - protected final ActorSelection selectActor(ActorRef ref) { + protected final ActorSelection selectActor(final ActorRef ref) { return shard.getContext().system().actorSelection(ref.path()); } - protected final ActorSelection selectActor(ActorPath path) { + protected final ActorSelection selectActor(final ActorPath path) { return shard.getContext().system().actorSelection(path); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/LocalFrontendHistory.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/LocalFrontendHistory.java index 17e861a3e7..b7239032b5 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/LocalFrontendHistory.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/LocalFrontendHistory.java @@ -7,7 +7,8 @@ */ package org.opendaylight.controller.cluster.datastore; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import com.google.common.collect.ImmutableMap; import com.google.common.collect.RangeSet; import com.google.common.collect.TreeRangeSet; @@ -20,7 +21,6 @@ import org.opendaylight.controller.cluster.access.concepts.LocalHistoryIdentifie import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification; - /** * Chained transaction specialization of {@link AbstractFrontendHistory}. It prevents concurrent open transactions. * @@ -33,7 +33,7 @@ final class LocalFrontendHistory extends AbstractFrontendHistory { final ShardDataTreeTransactionChain chain, final Map closedTransactions, final RangeSet purgedTransactions) { super(persistenceId, tree, closedTransactions, purgedTransactions); - this.chain = Preconditions.checkNotNull(chain); + this.chain = requireNonNull(chain); } static LocalFrontendHistory create(final String persistenceId, final ShardDataTree tree, diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/LocalTransactionContext.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/LocalTransactionContext.java index da6d6d14fe..fdba29c7f7 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/LocalTransactionContext.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/LocalTransactionContext.java @@ -7,8 +7,9 @@ */ package org.opendaylight.controller.cluster.datastore; +import static java.util.Objects.requireNonNull; + import akka.actor.ActorSelection; -import com.google.common.base.Preconditions; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.MoreExecutors; @@ -38,7 +39,7 @@ abstract class LocalTransactionContext extends AbstractTransactionContext { LocalTransactionContext(final DOMStoreTransaction txDelegate, final TransactionIdentifier identifier, final LocalTransactionReadySupport readySupport) { super(identifier); - this.txDelegate = Preconditions.checkNotNull(txDelegate); + this.txDelegate = requireNonNull(txDelegate); this.readySupport = readySupport; } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/OperationLimiter.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/OperationLimiter.java index e1fee6d62b..3f0c98c47f 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/OperationLimiter.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/OperationLimiter.java @@ -7,8 +7,10 @@ */ package org.opendaylight.controller.cluster.datastore; +import static com.google.common.base.Preconditions.checkArgument; +import static java.util.Objects.requireNonNull; + import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Preconditions; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; @@ -26,12 +28,12 @@ public class OperationLimiter { private final int maxPermits; OperationLimiter(final TransactionIdentifier identifier, final int maxPermits, final long acquireTimeoutSeconds) { - this.identifier = Preconditions.checkNotNull(identifier); + this.identifier = requireNonNull(identifier); - Preconditions.checkArgument(acquireTimeoutSeconds >= 0); + checkArgument(acquireTimeoutSeconds >= 0); this.acquireTimeout = TimeUnit.SECONDS.toNanos(acquireTimeoutSeconds); - Preconditions.checkArgument(maxPermits >= 0); + checkArgument(maxPermits >= 0); this.maxPermits = maxPermits; this.semaphore = new Semaphore(maxPermits); } @@ -60,7 +62,7 @@ public class OperationLimiter { release(1); } - void release(int permits) { + void release(final int permits) { this.semaphore.release(permits); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/RemoteTransactionContextSupport.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/RemoteTransactionContextSupport.java index a93d46f051..7be72393a2 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/RemoteTransactionContextSupport.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/RemoteTransactionContextSupport.java @@ -8,11 +8,12 @@ */ package org.opendaylight.controller.cluster.datastore; +import static java.util.Objects.requireNonNull; + import akka.actor.ActorSelection; import akka.dispatch.OnComplete; import akka.pattern.AskTimeoutException; import akka.util.Timeout; -import com.google.common.base.Preconditions; import java.util.concurrent.TimeUnit; import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; import org.opendaylight.controller.cluster.datastore.exceptions.NoShardLeaderException; @@ -61,7 +62,7 @@ final class RemoteTransactionContextSupport { RemoteTransactionContextSupport(final TransactionContextWrapper transactionContextWrapper, final TransactionProxy parent, final String shardName) { - this.parent = Preconditions.checkNotNull(parent); + this.parent = requireNonNull(parent); this.shardName = shardName; this.transactionContextWrapper = transactionContextWrapper; diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java index a7b89e1800..f634aecc62 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java @@ -7,7 +7,9 @@ */ package org.opendaylight.controller.cluster.datastore; +import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Verify.verify; +import static java.util.Objects.requireNonNull; import akka.actor.ActorRef; import akka.actor.ActorSelection; @@ -19,7 +21,6 @@ import akka.actor.Status.Failure; import akka.serialization.JavaSerializer; import akka.serialization.Serialization; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Preconditions; import com.google.common.base.Ticker; import com.google.common.base.Verify; import com.google.common.collect.ImmutableList; @@ -1101,7 +1102,7 @@ public class Shard extends RaftActor { } protected void checkSealed() { - Preconditions.checkState(!sealed, "Builder isalready sealed - further modifications are not allowed"); + checkState(!sealed, "Builder isalready sealed - further modifications are not allowed"); } @SuppressWarnings("unchecked") @@ -1129,7 +1130,7 @@ public class Shard extends RaftActor { public T schemaContextProvider(final SchemaContextProvider newSchemaContextProvider) { checkSealed(); - this.schemaContextProvider = Preconditions.checkNotNull(newSchemaContextProvider); + this.schemaContextProvider = requireNonNull(newSchemaContextProvider); return self(); } @@ -1182,10 +1183,10 @@ public class Shard extends RaftActor { } protected void verify() { - Preconditions.checkNotNull(id, "id should not be null"); - Preconditions.checkNotNull(peerAddresses, "peerAddresses should not be null"); - Preconditions.checkNotNull(datastoreContext, "dataStoreContext should not be null"); - Preconditions.checkNotNull(schemaContextProvider, "schemaContextProvider should not be null"); + requireNonNull(id, "id should not be null"); + requireNonNull(peerAddresses, "peerAddresses should not be null"); + requireNonNull(datastoreContext, "dataStoreContext should not be null"); + requireNonNull(schemaContextProvider, "schemaContextProvider should not be null"); } public Props props() { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardCommitCoordinator.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardCommitCoordinator.java index ad99fce946..d9520c5d5c 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardCommitCoordinator.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardCommitCoordinator.java @@ -7,11 +7,12 @@ */ package org.opendaylight.controller.cluster.datastore; +import static java.util.Objects.requireNonNull; + import akka.actor.ActorRef; import akka.actor.Status.Failure; import akka.serialization.Serialization; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Preconditions; import com.google.common.primitives.UnsignedLong; import com.google.common.util.concurrent.FutureCallback; import java.util.ArrayDeque; @@ -70,7 +71,7 @@ final class ShardCommitCoordinator { ShardCommitCoordinator(final ShardDataTree dataTree, final Logger log, final String name) { this.log = log; this.name = name; - this.dataTree = Preconditions.checkNotNull(dataTree); + this.dataTree = requireNonNull(dataTree); } int getCohortCacheSize() { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardDataTree.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardDataTree.java index 6e4ee7d9e1..221ff9c253 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardDataTree.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardDataTree.java @@ -7,13 +7,16 @@ */ package org.opendaylight.controller.cluster.datastore; +import static com.google.common.base.Preconditions.checkState; +import static com.google.common.base.Verify.verify; +import static com.google.common.base.Verify.verifyNotNull; +import static java.util.Objects.requireNonNull; + import akka.actor.ActorRef; import akka.util.Timeout; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.MoreObjects; -import com.google.common.base.Preconditions; import com.google.common.base.Stopwatch; -import com.google.common.base.Verify; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap.Builder; @@ -99,7 +102,7 @@ public class ShardDataTree extends ShardDataTreeTransactionParent { long lastAccess; CommitEntry(final SimpleShardDataTreeCohort cohort, final long now) { - this.cohort = Preconditions.checkNotNull(cohort); + this.cohort = requireNonNull(cohort); lastAccess = now; } @@ -155,12 +158,12 @@ public class ShardDataTree extends ShardDataTreeTransactionParent { final ShardDataTreeChangeListenerPublisher treeChangeListenerPublisher, final String logContext, final ShardDataTreeMetadata... metadata) { - this.dataTree = Preconditions.checkNotNull(dataTree); + this.dataTree = requireNonNull(dataTree); updateSchemaContext(schemaContext); - this.shard = Preconditions.checkNotNull(shard); - this.treeChangeListenerPublisher = Preconditions.checkNotNull(treeChangeListenerPublisher); - this.logContext = Preconditions.checkNotNull(logContext); + this.shard = requireNonNull(shard); + this.treeChangeListenerPublisher = requireNonNull(treeChangeListenerPublisher); + this.logContext = requireNonNull(logContext); this.metadata = ImmutableList.copyOf(metadata); tip = dataTree; } @@ -206,7 +209,7 @@ public class ShardDataTree extends ShardDataTreeTransactionParent { void updateSchemaContext(final SchemaContext newSchemaContext) { dataTree.setSchemaContext(newSchemaContext); - this.schemaContext = Preconditions.checkNotNull(newSchemaContext); + this.schemaContext = requireNonNull(newSchemaContext); this.dataSchemaContext = DataSchemaContextTree.from(newSchemaContext); } @@ -411,7 +414,7 @@ public class ShardDataTree extends ShardDataTreeTransactionParent { ((CommitTransactionPayload) payload).getCandidate(); applyReplicatedCandidate(e.getKey(), e.getValue()); } else { - Verify.verify(identifier instanceof TransactionIdentifier); + verify(identifier instanceof TransactionIdentifier); payloadReplicationComplete((TransactionIdentifier) identifier); } } else if (payload instanceof AbortTransactionPayload) { @@ -527,8 +530,7 @@ public class ShardDataTree extends ShardDataTreeTransactionParent { final boolean closed) { final ShardDataTreeTransactionChain ret = new ShardDataTreeTransactionChain(historyId, this); final ShardDataTreeTransactionChain existing = transactionChains.putIfAbsent(historyId, ret); - Preconditions.checkState(existing == null, "Attempted to recreate chain %s, but %s already exists", historyId, - existing); + checkState(existing == null, "Attempted to recreate chain %s, but %s already exists", historyId, existing); return ret; } @@ -930,10 +932,10 @@ public class ShardDataTree extends ShardDataTreeTransactionParent { @SuppressWarnings("checkstyle:IllegalCatch") void startPreCommit(final SimpleShardDataTreeCohort cohort) { final CommitEntry entry = pendingTransactions.peek(); - Preconditions.checkState(entry != null, "Attempted to pre-commit of %s when no transactions pending", cohort); + checkState(entry != null, "Attempted to pre-commit of %s when no transactions pending", cohort); final SimpleShardDataTreeCohort current = entry.cohort; - Verify.verify(cohort.equals(current), "Attempted to pre-commit %s while %s is pending", cohort, current); + verify(cohort.equals(current), "Attempted to pre-commit %s while %s is pending", cohort, current); final TransactionIdentifier currentId = current.getIdentifier(); LOG.debug("{}: Preparing transaction {}", logContext, currentId); @@ -951,7 +953,7 @@ public class ShardDataTree extends ShardDataTreeTransactionParent { @Override public void onSuccess(final Void noop) { // Set the tip of the data tree. - tip = Verify.verifyNotNull(candidate); + tip = verifyNotNull(candidate); entry.lastAccess = readTime(); @@ -1013,7 +1015,7 @@ public class ShardDataTree extends ShardDataTreeTransactionParent { void startCommit(final SimpleShardDataTreeCohort cohort, final DataTreeCandidate candidate) { final CommitEntry entry = pendingCommits.peek(); - Preconditions.checkState(entry != null, "Attempted to start commit of %s when no transactions pending", cohort); + checkState(entry != null, "Attempted to start commit of %s when no transactions pending", cohort); final SimpleShardDataTreeCohort current = entry.cohort; if (!cohort.equals(current)) { @@ -1253,7 +1255,7 @@ public class ShardDataTree extends ShardDataTreeTransactionParent { @SuppressWarnings("checkstyle:IllegalCatch") private void rebaseTransactions(final Iterator iter, final @NonNull DataTreeTip newTip) { - tip = Preconditions.checkNotNull(newTip); + tip = requireNonNull(newTip); while (iter.hasNext()) { final SimpleShardDataTreeCohort cohort = iter.next().cohort; if (cohort.getState() == State.CAN_COMMIT_COMPLETE) { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardDataTreeTransactionChain.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardDataTreeTransactionChain.java index 9406eab6b9..7917ae0177 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardDataTreeTransactionChain.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardDataTreeTransactionChain.java @@ -7,8 +7,10 @@ */ package org.opendaylight.controller.cluster.datastore; +import static com.google.common.base.Preconditions.checkState; +import static java.util.Objects.requireNonNull; + import com.google.common.base.MoreObjects; -import com.google.common.base.Preconditions; import java.util.Optional; import java.util.SortedSet; import org.opendaylight.controller.cluster.access.concepts.LocalHistoryIdentifier; @@ -34,13 +36,13 @@ final class ShardDataTreeTransactionChain extends ShardDataTreeTransactionParent private boolean closed; ShardDataTreeTransactionChain(final LocalHistoryIdentifier localHistoryIdentifier, final ShardDataTree dataTree) { - this.chainId = Preconditions.checkNotNull(localHistoryIdentifier); - this.dataTree = Preconditions.checkNotNull(dataTree); + this.chainId = requireNonNull(localHistoryIdentifier); + this.dataTree = requireNonNull(dataTree); } private DataTreeSnapshot getSnapshot() { - Preconditions.checkState(!closed, "TransactionChain %s has been closed", this); - Preconditions.checkState(openTransaction == null, "Transaction %s is open", openTransaction); + checkState(!closed, "TransactionChain %s has been closed", this); + checkState(openTransaction == null, "Transaction %s is open", openTransaction); if (previousTx == null) { LOG.debug("Opening an unchained snapshot in {}", chainId); @@ -74,8 +76,8 @@ final class ShardDataTreeTransactionChain extends ShardDataTreeTransactionParent @Override void abortFromTransactionActor(final AbstractShardDataTreeTransaction transaction) { if (transaction instanceof ReadWriteShardDataTreeTransaction) { - Preconditions.checkState(openTransaction != null, - "Attempted to abort transaction %s while none is outstanding", transaction); + checkState(openTransaction != null, "Attempted to abort transaction %s while none is outstanding", + transaction); LOG.debug("Aborted open transaction {}", transaction); openTransaction = null; } @@ -90,8 +92,8 @@ final class ShardDataTreeTransactionChain extends ShardDataTreeTransactionParent @Override ShardDataTreeCohort finishTransaction(final ReadWriteShardDataTreeTransaction transaction, final Optional> participatingShardNames) { - Preconditions.checkState(openTransaction != null, - "Attempted to finish transaction %s while none is outstanding", transaction); + checkState(openTransaction != null, "Attempted to finish transaction %s while none is outstanding", + transaction); // dataTree is finalizing ready the transaction, we just record it for the next // transaction in chain diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardReadTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardReadTransaction.java index fc3bfda1eb..3b0105bf67 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardReadTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardReadTransaction.java @@ -5,11 +5,11 @@ * 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.datastore; +import static java.util.Objects.requireNonNull; + import akka.actor.ActorRef; -import com.google.common.base.Preconditions; import org.opendaylight.controller.cluster.datastore.jmx.mbeans.shard.ShardStats; import org.opendaylight.controller.cluster.datastore.messages.DataExists; import org.opendaylight.controller.cluster.datastore.messages.ReadData; @@ -22,14 +22,14 @@ import org.opendaylight.controller.cluster.datastore.messages.ReadData; public class ShardReadTransaction extends ShardTransaction { private final AbstractShardDataTreeTransaction transaction; - public ShardReadTransaction(AbstractShardDataTreeTransaction transaction, ActorRef shardActor, - ShardStats shardStats) { + public ShardReadTransaction(final AbstractShardDataTreeTransaction transaction, final ActorRef shardActor, + final ShardStats shardStats) { super(shardActor, shardStats, transaction.getIdentifier()); - this.transaction = Preconditions.checkNotNull(transaction); + this.transaction = requireNonNull(transaction); } @Override - public void handleReceive(Object message) { + public void handleReceive(final Object message) { if (ReadData.isSerializedType(message)) { readData(transaction, ReadData.fromSerializable(message)); } else if (DataExists.isSerializedType(message)) { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardRecoveryCoordinator.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardRecoveryCoordinator.java index 7ece110d01..aeaad48806 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardRecoveryCoordinator.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardRecoveryCoordinator.java @@ -7,7 +7,9 @@ */ package org.opendaylight.controller.cluster.datastore; -import com.google.common.base.Preconditions; +import static com.google.common.base.Preconditions.checkState; +import static java.util.Objects.requireNonNull; + import java.io.File; import org.opendaylight.controller.cluster.datastore.persisted.ShardDataTreeSnapshot; import org.opendaylight.controller.cluster.datastore.persisted.ShardSnapshotState; @@ -44,7 +46,7 @@ abstract class ShardRecoveryCoordinator implements RaftActorRecoveryCohort { WithSnapshot(final ShardDataTree store, final String shardName, final Logger log, final Snapshot snapshot) { super(store, shardName, log); - this.restoreFromSnapshot = Preconditions.checkNotNull(snapshot); + this.restoreFromSnapshot = requireNonNull(snapshot); } @Override @@ -60,9 +62,9 @@ abstract class ShardRecoveryCoordinator implements RaftActorRecoveryCohort { private boolean open; ShardRecoveryCoordinator(final ShardDataTree store, final String shardName, final Logger log) { - this.store = Preconditions.checkNotNull(store); - this.shardName = Preconditions.checkNotNull(shardName); - this.log = Preconditions.checkNotNull(log); + this.store = requireNonNull(store); + this.shardName = requireNonNull(shardName); + this.log = requireNonNull(log); } static ShardRecoveryCoordinator create(final ShardDataTree store, final String shardName, final Logger log) { @@ -83,7 +85,7 @@ abstract class ShardRecoveryCoordinator implements RaftActorRecoveryCohort { @Override @SuppressWarnings("checkstyle:IllegalCatch") public void appendRecoveredLogEntry(final Payload payload) { - Preconditions.checkState(open, "call startLogRecovery before calling appendRecoveredLogEntry"); + checkState(open, "call startLogRecovery before calling appendRecoveredLogEntry"); try { store.applyRecoveryPayload(payload); @@ -99,7 +101,7 @@ abstract class ShardRecoveryCoordinator implements RaftActorRecoveryCohort { */ @Override public void applyCurrentLogRecoveryBatch() { - Preconditions.checkState(open, "call startLogRecovery before calling applyCurrentLogRecoveryBatch"); + checkState(open, "call startLogRecovery before calling applyCurrentLogRecoveryBatch"); open = false; } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardSnapshotCohort.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardSnapshotCohort.java index e936d4389b..126e28d9c8 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardSnapshotCohort.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardSnapshotCohort.java @@ -7,9 +7,10 @@ */ package org.opendaylight.controller.cluster.datastore; +import static java.util.Objects.requireNonNull; + import akka.actor.ActorContext; import akka.actor.ActorRef; -import com.google.common.base.Preconditions; import com.google.common.io.ByteSource; import java.io.IOException; import java.io.ObjectInputStream; @@ -43,8 +44,8 @@ final class ShardSnapshotCohort implements RaftActorSnapshotCohort { private ShardSnapshotCohort(final LocalHistoryIdentifier applyHistoryId, final ActorRef snapshotActor, final ShardDataTree store, final Logger log, final String logId) { - this.snapshotActor = Preconditions.checkNotNull(snapshotActor); - this.store = Preconditions.checkNotNull(store); + this.snapshotActor = requireNonNull(snapshotActor); + this.store = requireNonNull(store); this.log = log; this.logId = logId; } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardTransaction.java index 87dd5e3e26..97426402bc 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardTransaction.java @@ -5,15 +5,15 @@ * 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.datastore; +import static java.util.Objects.requireNonNull; + import akka.actor.ActorRef; import akka.actor.PoisonPill; import akka.actor.Props; import akka.actor.ReceiveTimeout; import akka.japi.Creator; -import com.google.common.base.Preconditions; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; import org.opendaylight.controller.cluster.common.actor.AbstractUntypedActorWithMetering; @@ -41,7 +41,7 @@ public abstract class ShardTransaction extends AbstractUntypedActorWithMetering super("shard-tx"); this.shardActor = shardActor; this.shardStats = shardStats; - this.transactionId = Preconditions.checkNotNull(transactionId); + this.transactionId = requireNonNull(transactionId); } public static Props props(final TransactionType type, final AbstractShardDataTreeTransaction transaction, @@ -130,7 +130,7 @@ public abstract class ShardTransaction extends AbstractUntypedActorWithMetering ShardTransactionCreator(final TransactionType type, final AbstractShardDataTreeTransaction transaction, final ActorRef shardActor, final DatastoreContext datastoreContext, final ShardStats shardStats) { - this.transaction = Preconditions.checkNotNull(transaction); + this.transaction = requireNonNull(transaction); this.shardActor = shardActor; this.shardStats = shardStats; this.datastoreContext = datastoreContext; diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ThreePhaseCommitCohortProxy.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ThreePhaseCommitCohortProxy.java index 9505894b4b..a96be9fcb1 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ThreePhaseCommitCohortProxy.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ThreePhaseCommitCohortProxy.java @@ -13,7 +13,6 @@ import static java.util.Objects.requireNonNull; import akka.actor.ActorSelection; import akka.dispatch.OnComplete; import com.google.common.base.Supplier; -import com.google.common.collect.Lists; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; @@ -213,7 +212,7 @@ public class ThreePhaseCommitCohortProxy extends AbstractThreePhaseCommitCohort< } private Future> invokeCohorts(final MessageSupplier messageSupplier) { - List> futureList = Lists.newArrayListWithCapacity(cohorts.size()); + List> futureList = new ArrayList<>(cohorts.size()); for (CohortInfo cohort : cohorts) { Object message = messageSupplier.newMessage(transactionId, cohort.getActorVersion()); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionChainProxy.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionChainProxy.java index c3b81d7e15..7c36adb70e 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionChainProxy.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionChainProxy.java @@ -7,10 +7,12 @@ */ package org.opendaylight.controller.cluster.datastore; +import static com.google.common.base.Preconditions.checkState; +import static java.util.Objects.requireNonNull; + import akka.actor.ActorSelection; import akka.dispatch.Futures; import akka.dispatch.OnComplete; -import com.google.common.base.Preconditions; import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -61,7 +63,7 @@ final class TransactionChainProxy extends AbstractTransactionContextFactory previousFuture) { this.previousFuture = previousFuture; - this.transaction = Preconditions.checkNotNull(transaction); + this.transaction = requireNonNull(transaction); } @Override @@ -292,11 +294,11 @@ final class TransactionChainProxy extends AbstractTransactionContextFactory void onTransactionReady(final TransactionIdentifier transaction, final Collection> cohortFutures) { final State localState = currentState; - Preconditions.checkState(localState instanceof Allocated, "Readying transaction %s while state is %s", - transaction, localState); + checkState(localState instanceof Allocated, "Readying transaction %s while state is %s", transaction, + localState); final TransactionIdentifier currentTx = ((Allocated)localState).getIdentifier(); - Preconditions.checkState(transaction.equals(currentTx), "Readying transaction %s while %s is allocated", - transaction, currentTx); + checkState(transaction.equals(currentTx), "Readying transaction %s while %s is allocated", transaction, + currentTx); // Transaction ready and we are not waiting for futures -- go to idle if (cohortFutures.isEmpty()) { @@ -322,7 +324,7 @@ final class TransactionChainProxy extends AbstractTransactionContextFactory promise = priorReadOnlyTxPromises.remove(transactionId); if (promise != null) { promise.success(null); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionProxy.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionProxy.java index 83863de00d..155bb1fd3e 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionProxy.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionProxy.java @@ -7,10 +7,12 @@ */ package org.opendaylight.controller.cluster.datastore; +import static com.google.common.base.Preconditions.checkState; +import static java.util.Objects.requireNonNull; + import akka.actor.ActorSelection; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; -import com.google.common.base.Preconditions; import com.google.common.base.Supplier; import com.google.common.collect.Iterables; import com.google.common.util.concurrent.FluentFuture; @@ -71,7 +73,7 @@ public class TransactionProxy extends AbstractDOMStoreTransaction FluentFuture executeRead(final String shardName, final AbstractRead readCmd) { - Preconditions.checkState(type != TransactionType.WRITE_ONLY, - "Reads from write-only transactions are not allowed"); + checkState(type != TransactionType.WRITE_ONLY, "Reads from write-only transactions are not allowed"); LOG.trace("Tx {} {} {}", getIdentifier(), readCmd.getClass().getSimpleName(), readCmd.getPath()); @@ -101,9 +102,8 @@ public class TransactionProxy extends AbstractDOMStoreTransaction>> read(final YangInstanceIdentifier path) { - Preconditions.checkState(type != TransactionType.WRITE_ONLY, - "Reads from write-only transactions are not allowed"); - Preconditions.checkNotNull(path, "path should not be null"); + checkState(type != TransactionType.WRITE_ONLY, "Reads from write-only transactions are not allowed"); + requireNonNull(path, "path should not be null"); LOG.trace("Tx {} read {}", getIdentifier(), path); return path.isEmpty() ? readAllData() : singleShardRead(shardNameFromIdentifier(path), path); @@ -170,10 +170,8 @@ public class TransactionProxy extends AbstractDOMStoreTransaction ready() { - Preconditions.checkState(type != TransactionType.READ_ONLY, "Read-only transactions cannot be readied"); + checkState(type != TransactionType.READ_ONLY, "Read-only transactions cannot be readied"); final boolean success = seal(TransactionState.READY); - Preconditions.checkState(success, "Transaction %s is %s, it cannot be readied", getIdentifier(), state); + checkState(success, "Transaction %s is %s, it cannot be readied", getIdentifier(), state); LOG.debug("Tx {} Readying {} components for commit", getIdentifier(), txContextWrappers.size()); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/actors/DataTreeNotificationListenerRegistrationActor.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/actors/DataTreeNotificationListenerRegistrationActor.java index 38c7620b63..7d9118dfbe 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/actors/DataTreeNotificationListenerRegistrationActor.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/actors/DataTreeNotificationListenerRegistrationActor.java @@ -7,12 +7,13 @@ */ package org.opendaylight.controller.cluster.datastore.actors; +import static java.util.Objects.requireNonNull; + import akka.actor.ActorRef; import akka.actor.Cancellable; import akka.actor.PoisonPill; import akka.actor.Props; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Preconditions; import java.util.concurrent.TimeUnit; import org.opendaylight.controller.cluster.common.actor.AbstractUntypedActor; import org.opendaylight.controller.cluster.datastore.messages.CloseDataTreeNotificationListenerRegistration; @@ -34,7 +35,7 @@ public final class DataTreeNotificationListenerRegistrationActor extends Abstrac private Cancellable killSchedule; @Override - protected void handleReceive(Object message) { + protected void handleReceive(final Object message) { if (message instanceof CloseDataTreeNotificationListenerRegistration) { closeListenerRegistration(); if (isValidSender(getSender())) { @@ -75,8 +76,8 @@ public final class DataTreeNotificationListenerRegistrationActor extends Abstrac private final Runnable onClose; public SetRegistration(final ListenerRegistration registration, final Runnable onClose) { - this.registration = Preconditions.checkNotNull(registration); - this.onClose = Preconditions.checkNotNull(onClose); + this.registration = requireNonNull(registration); + this.onClose = requireNonNull(onClose); } } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/actors/ShardSnapshotActor.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/actors/ShardSnapshotActor.java index 14cf4cd1a3..bdc2ec48d7 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/actors/ShardSnapshotActor.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/actors/ShardSnapshotActor.java @@ -7,9 +7,10 @@ */ package org.opendaylight.controller.cluster.datastore.actors; +import static java.util.Objects.requireNonNull; + import akka.actor.ActorRef; import akka.actor.Props; -import com.google.common.base.Preconditions; import java.io.IOException; import java.io.ObjectOutputStream; import java.io.OutputStream; @@ -34,9 +35,9 @@ public final class ShardSnapshotActor extends AbstractUntypedActorWithMetering { SerializeSnapshot(final ShardDataTreeSnapshot snapshot, final Optional installSnapshotStream, final ActorRef replyTo) { - this.snapshot = Preconditions.checkNotNull(snapshot); - this.installSnapshotStream = Preconditions.checkNotNull(installSnapshotStream); - this.replyTo = Preconditions.checkNotNull(replyTo); + this.snapshot = requireNonNull(snapshot); + this.installSnapshotStream = requireNonNull(installSnapshotStream); + this.replyTo = requireNonNull(replyTo); } ShardDataTreeSnapshot getSnapshot() { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/config/ConfigurationImpl.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/config/ConfigurationImpl.java index 7588b6d77c..4da39ef154 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/config/ConfigurationImpl.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/config/ConfigurationImpl.java @@ -7,7 +7,8 @@ */ package org.opendaylight.controller.cluster.datastore.config; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import java.util.AbstractMap.SimpleEntry; @@ -56,7 +57,7 @@ public class ConfigurationImpl implements Configuration { this.namespaceToModuleName = createNamespaceToModuleName(moduleConfigMap.values()); } - private static Set createAllShardNames(Iterable moduleConfigs) { + private static Set createAllShardNames(final Iterable moduleConfigs) { final ImmutableSet.Builder builder = ImmutableSet.builder(); for (ModuleConfig moduleConfig : moduleConfigs) { builder.addAll(moduleConfig.getShardNames()); @@ -65,7 +66,7 @@ public class ConfigurationImpl implements Configuration { return builder.build(); } - private static Map createNamespaceToModuleName(Iterable moduleConfigs) { + private static Map createNamespaceToModuleName(final Iterable moduleConfigs) { final ImmutableMap.Builder builder = ImmutableMap.builder(); for (ModuleConfig moduleConfig : moduleConfigs) { if (moduleConfig.getNamespace() != null) { @@ -78,7 +79,7 @@ public class ConfigurationImpl implements Configuration { @Override public Collection getMemberShardNames(final MemberName memberName) { - Preconditions.checkNotNull(memberName, "memberName should not be null"); + requireNonNull(memberName, "memberName should not be null"); List shards = new ArrayList<>(); for (ModuleConfig moduleConfig: moduleConfigMap.values()) { @@ -94,14 +95,14 @@ public class ConfigurationImpl implements Configuration { @Override public String getModuleNameFromNameSpace(final String nameSpace) { - Preconditions.checkNotNull(nameSpace, "nameSpace should not be null"); + requireNonNull(nameSpace, "nameSpace should not be null"); return namespaceToModuleName.get(nameSpace); } @Override - public ShardStrategy getStrategyForModule(String moduleName) { - Preconditions.checkNotNull(moduleName, "moduleName should not be null"); + public ShardStrategy getStrategyForModule(final String moduleName) { + requireNonNull(moduleName, "moduleName should not be null"); ModuleConfig moduleConfig = moduleConfigMap.get(moduleName); return moduleConfig != null ? moduleConfig.getShardStrategy() : null; @@ -109,7 +110,7 @@ public class ConfigurationImpl implements Configuration { @Override public String getShardNameForModule(final String moduleName) { - Preconditions.checkNotNull(moduleName, "moduleName should not be null"); + requireNonNull(moduleName, "moduleName should not be null"); ModuleConfig moduleConfig = moduleConfigMap.get(moduleName); Collection shardConfigs = moduleConfig != null ? moduleConfig.getShardConfigs() : @@ -119,11 +120,10 @@ public class ConfigurationImpl implements Configuration { @Override public String getShardNameForPrefix(final DOMDataTreeIdentifier prefix) { - Preconditions.checkNotNull(prefix, "prefix should not be null"); + requireNonNull(prefix, "prefix should not be null"); - Entry bestMatchEntry = - new SimpleEntry<>( - new DOMDataTreeIdentifier(prefix.getDatastoreType(), YangInstanceIdentifier.EMPTY), null); + Entry bestMatchEntry = new SimpleEntry<>( + new DOMDataTreeIdentifier(prefix.getDatastoreType(), YangInstanceIdentifier.EMPTY), null); for (Entry entry : prefixConfigMap.entrySet()) { if (entry.getKey().contains(prefix) && entry.getKey().getRootIdentifier().getPathArguments().size() @@ -157,7 +157,7 @@ public class ConfigurationImpl implements Configuration { } private static void checkNotNullShardName(final String shardName) { - Preconditions.checkNotNull(shardName, "shardName should not be null"); + requireNonNull(shardName, "shardName should not be null"); } @Override @@ -176,8 +176,8 @@ public class ConfigurationImpl implements Configuration { } @Override - public synchronized void addModuleShardConfiguration(ModuleShardConfiguration config) { - Preconditions.checkNotNull(config, "ModuleShardConfiguration should not be null"); + public synchronized void addModuleShardConfiguration(final ModuleShardConfiguration config) { + requireNonNull(config, "ModuleShardConfiguration should not be null"); ModuleConfig moduleConfig = ModuleConfig.builder(config.getModuleName()) .nameSpace(config.getNamespace().toASCIIString()) @@ -193,17 +193,14 @@ public class ConfigurationImpl implements Configuration { @Override public void addPrefixShardConfiguration(final PrefixShardConfiguration config) { - Preconditions.checkNotNull(config, "PrefixShardConfiguration cannot be null"); - addPrefixConfig(config); + addPrefixConfig(requireNonNull(config, "PrefixShardConfiguration cannot be null")); allShardNames = ImmutableSet.builder().addAll(allShardNames) .add(ClusterUtils.getCleanShardName(config.getPrefix().getRootIdentifier())).build(); } @Override public void removePrefixShardConfiguration(final DOMDataTreeIdentifier prefix) { - Preconditions.checkNotNull(prefix, "Prefix cannot be null"); - - removePrefixConfig(prefix); + removePrefixConfig(requireNonNull(prefix, "Prefix cannot be null")); final HashSet temp = new HashSet<>(allShardNames); temp.remove(ClusterUtils.getCleanShardName(prefix.getRootIdentifier())); @@ -228,20 +225,20 @@ public class ConfigurationImpl implements Configuration { prefixConfigMap = ImmutableMap.copyOf(newPrefixConfigMap); } - private ShardStrategy createShardStrategy(String moduleName, String shardStrategyName) { + private ShardStrategy createShardStrategy(final String moduleName, final String shardStrategyName) { return ShardStrategyFactory.newShardStrategyInstance(moduleName, shardStrategyName, this); } @Override - public boolean isShardConfigured(String shardName) { + public boolean isShardConfigured(final String shardName) { checkNotNullShardName(shardName); return allShardNames.contains(shardName); } @Override - public void addMemberReplicaForShard(String shardName, MemberName newMemberName) { + public void addMemberReplicaForShard(final String shardName, final MemberName newMemberName) { checkNotNullShardName(shardName); - Preconditions.checkNotNull(newMemberName, "MemberName should not be null"); + requireNonNull(newMemberName, "MemberName should not be null"); for (ModuleConfig moduleConfig: moduleConfigMap.values()) { ShardConfig shardConfig = moduleConfig.getShardConfig(shardName); @@ -255,9 +252,9 @@ public class ConfigurationImpl implements Configuration { } @Override - public void removeMemberReplicaForShard(String shardName, MemberName newMemberName) { + public void removeMemberReplicaForShard(final String shardName, final MemberName newMemberName) { checkNotNullShardName(shardName); - Preconditions.checkNotNull(newMemberName, "MemberName should not be null"); + requireNonNull(newMemberName, "MemberName should not be null"); for (ModuleConfig moduleConfig: moduleConfigMap.values()) { ShardConfig shardConfig = moduleConfig.getShardConfig(shardName); @@ -272,11 +269,10 @@ public class ConfigurationImpl implements Configuration { @Override public ShardStrategy getStrategyForPrefix(final DOMDataTreeIdentifier prefix) { - Preconditions.checkNotNull(prefix, "Prefix cannot be null"); + requireNonNull(prefix, "Prefix cannot be null"); // FIXME using prefix tables like in mdsal will be better - Entry bestMatchEntry = - new SimpleEntry<>( - new DOMDataTreeIdentifier(prefix.getDatastoreType(), YangInstanceIdentifier.EMPTY), null); + Entry bestMatchEntry = new SimpleEntry<>( + new DOMDataTreeIdentifier(prefix.getDatastoreType(), YangInstanceIdentifier.EMPTY), null); for (Entry entry : prefixConfigMap.entrySet()) { if (entry.getKey().contains(prefix) && entry.getKey().getRootIdentifier().getPathArguments().size() diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/config/PrefixShardConfiguration.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/config/PrefixShardConfiguration.java index c387fe4ba2..dc6db2c6be 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/config/PrefixShardConfiguration.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/config/PrefixShardConfiguration.java @@ -5,10 +5,10 @@ * 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.datastore.config; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import com.google.common.collect.ImmutableSet; import java.io.Externalizable; import java.io.IOException; @@ -79,8 +79,8 @@ public class PrefixShardConfiguration implements Serializable { public PrefixShardConfiguration(final DOMDataTreeIdentifier prefix, final String shardStrategyName, final Collection shardMemberNames) { - this.prefix = Preconditions.checkNotNull(prefix); - this.shardStrategyName = Preconditions.checkNotNull(shardStrategyName); + this.prefix = requireNonNull(prefix); + this.shardStrategyName = requireNonNull(shardStrategyName); this.shardMemberNames = ImmutableSet.copyOf(shardMemberNames); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipListenerRegistration.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipListenerRegistration.java index 149551b8c8..7d1184aab9 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipListenerRegistration.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipListenerRegistration.java @@ -7,8 +7,9 @@ */ package org.opendaylight.controller.cluster.datastore.entityownership; +import static java.util.Objects.requireNonNull; + import com.google.common.base.MoreObjects.ToStringHelper; -import com.google.common.base.Preconditions; import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipListener; import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipListenerRegistration; import org.opendaylight.yangtools.concepts.AbstractObjectRegistration; @@ -26,8 +27,8 @@ class DistributedEntityOwnershipListenerRegistration extends AbstractObjectRegis DistributedEntityOwnershipListenerRegistration(final DOMEntityOwnershipListener listener, final String entityType, final DistributedEntityOwnershipService service) { super(listener); - this.entityType = Preconditions.checkNotNull(entityType, "entityType cannot be null"); - this.service = Preconditions.checkNotNull(service, "DOMEntityOwnershipListener cannot be null"); + this.entityType = requireNonNull(entityType, "entityType cannot be null"); + this.service = requireNonNull(service, "DOMEntityOwnershipListener cannot be null"); } @Override diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnerChangeListener.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnerChangeListener.java index 0201745319..38dbae3865 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnerChangeListener.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnerChangeListener.java @@ -7,11 +7,11 @@ */ package org.opendaylight.controller.cluster.datastore.entityownership; +import static com.google.common.base.Verify.verifyNotNull; +import static java.util.Objects.requireNonNull; import static org.opendaylight.controller.cluster.datastore.entityownership.EntityOwnersModel.createEntity; -import com.google.common.base.Preconditions; import com.google.common.base.Strings; -import com.google.common.base.Verify; import java.util.Collection; import java.util.Objects; import java.util.Optional; @@ -36,8 +36,8 @@ class EntityOwnerChangeListener extends AbstractEntityOwnerChangeListener { private final EntityOwnershipChangePublisher publisher; EntityOwnerChangeListener(final MemberName localMemberName, final EntityOwnershipChangePublisher publisher) { - this.localMemberName = Verify.verifyNotNull(localMemberName.getName()); - this.publisher = Preconditions.checkNotNull(publisher); + this.localMemberName = verifyNotNull(localMemberName.getName()); + this.publisher = requireNonNull(publisher); } @Override diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipListenerActor.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipListenerActor.java index 42779b06ed..0a1bb92399 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipListenerActor.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipListenerActor.java @@ -7,9 +7,10 @@ */ package org.opendaylight.controller.cluster.datastore.entityownership; +import static java.util.Objects.requireNonNull; + import akka.actor.Props; import akka.japi.Creator; -import com.google.common.base.Preconditions; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import org.opendaylight.controller.cluster.common.actor.AbstractUntypedActor; import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipChange; @@ -59,7 +60,7 @@ final class EntityOwnershipListenerActor extends AbstractUntypedActor { private final DOMEntityOwnershipListener listener; EntityOwnershipListenerCreator(final DOMEntityOwnershipListener listener) { - this.listener = Preconditions.checkNotNull(listener); + this.listener = requireNonNull(listener); } @Override diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipShard.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipShard.java index 6e1d1a855a..cd97b0bcdd 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipShard.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipShard.java @@ -7,6 +7,7 @@ */ package org.opendaylight.controller.cluster.datastore.entityownership; +import static java.util.Objects.requireNonNull; import static org.opendaylight.controller.cluster.datastore.entityownership.EntityOwnersModel.CANDIDATE_NAME_NODE_ID; import static org.opendaylight.controller.cluster.datastore.entityownership.EntityOwnersModel.CANDIDATE_NODE_ID; import static org.opendaylight.controller.cluster.datastore.entityownership.EntityOwnersModel.ENTITY_ID_NODE_ID; @@ -30,7 +31,6 @@ import akka.cluster.ClusterEvent.CurrentClusterState; import akka.cluster.Member; import akka.cluster.MemberStatus; import akka.pattern.Patterns; -import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -705,8 +705,8 @@ class EntityOwnershipShard extends Shard { @Override protected void verify() { super.verify(); - Preconditions.checkNotNull(localMemberName, "localMemberName should not be null"); - Preconditions.checkNotNull(ownerSelectionStrategyConfig, "ownerSelectionStrategyConfig should not be null"); + requireNonNull(localMemberName, "localMemberName should not be null"); + requireNonNull(ownerSelectionStrategyConfig, "ownerSelectionStrategyConfig should not be null"); } } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipShardCommitCoordinator.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipShardCommitCoordinator.java index a343d7373f..eaca661619 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipShardCommitCoordinator.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipShardCommitCoordinator.java @@ -7,12 +7,12 @@ */ package org.opendaylight.controller.cluster.datastore.entityownership; +import static java.util.Objects.requireNonNull; import static org.opendaylight.controller.cluster.datastore.entityownership.EntityOwnersModel.ENTITY_OWNER_QNAME; import akka.actor.ActorRef; import akka.actor.Cancellable; import akka.actor.Status.Failure; -import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import java.util.Iterator; import java.util.LinkedList; @@ -56,13 +56,13 @@ class EntityOwnershipShardCommitCoordinator { private Cancellable retryCommitSchedule; private long transactionIDCounter = 0; - EntityOwnershipShardCommitCoordinator(MemberName localMemberName, Logger log) { - this.log = Preconditions.checkNotNull(log); + EntityOwnershipShardCommitCoordinator(final MemberName localMemberName, final Logger log) { + this.log = requireNonNull(log); historyId = new LocalHistoryIdentifier( ClientIdentifier.create(FrontendIdentifier.create(localMemberName, FRONTEND_TYPE), 0), 0); } - boolean handleMessage(Object message, EntityOwnershipShard shard) { + boolean handleMessage(final Object message, final EntityOwnershipShard shard) { boolean handled = true; if (CommitTransactionReply.isSerializedType(message)) { // Successful reply from a local commit. @@ -79,7 +79,7 @@ class EntityOwnershipShardCommitCoordinator { return handled; } - private void retryInflightCommit(EntityOwnershipShard shard) { + private void retryInflightCommit(final EntityOwnershipShard shard) { // Shouldn't be null happen but verify anyway if (inflightCommit == null) { return; @@ -94,7 +94,7 @@ class EntityOwnershipShardCommitCoordinator { } } - void inflightCommitFailure(Throwable cause, EntityOwnershipShard shard) { + void inflightCommitFailure(final Throwable cause, final EntityOwnershipShard shard) { // This should've originated from a failed inflight commit but verify anyway if (inflightCommit == null) { return; @@ -111,7 +111,7 @@ class EntityOwnershipShardCommitCoordinator { scheduleInflightCommitRetry(shard); } - private void scheduleInflightCommitRetry(EntityOwnershipShard shard) { + private void scheduleInflightCommitRetry(final EntityOwnershipShard shard) { FiniteDuration duration = shard.getDatastoreContext().getShardRaftConfig().getElectionTimeOutInterval(); log.debug("Scheduling retry for BatchedModifications commit {} in {}", @@ -121,7 +121,7 @@ class EntityOwnershipShardCommitCoordinator { COMMIT_RETRY_MESSAGE, shard.getContext().dispatcher(), ActorRef.noSender()); } - void inflightCommitSucceeded(EntityOwnershipShard shard) { + void inflightCommitSucceeded(final EntityOwnershipShard shard) { // Shouldn't be null but verify anyway if (inflightCommit == null) { return; @@ -137,7 +137,7 @@ class EntityOwnershipShardCommitCoordinator { commitNextBatch(shard); } - void commitNextBatch(EntityOwnershipShard shard) { + void commitNextBatch(final EntityOwnershipShard shard) { if (inflightCommit != null || pendingModifications.isEmpty() || !shard.hasLeader()) { return; } @@ -159,11 +159,11 @@ class EntityOwnershipShardCommitCoordinator { shard.tryCommitModifications(inflightCommit); } - void commitModification(Modification modification, EntityOwnershipShard shard) { + void commitModification(final Modification modification, final EntityOwnershipShard shard) { commitModifications(ImmutableList.of(modification), shard); } - void commitModifications(List modifications, EntityOwnershipShard shard) { + void commitModifications(final List modifications, final EntityOwnershipShard shard) { if (modifications.isEmpty()) { return; } @@ -183,7 +183,7 @@ class EntityOwnershipShardCommitCoordinator { } } - void onStateChanged(EntityOwnershipShard shard, boolean isLeader) { + void onStateChanged(final EntityOwnershipShard shard, final boolean isLeader) { shard.possiblyRemoveAllInitialCandidates(shard.getLeader()); possiblyPrunePendingCommits(shard, isLeader); @@ -204,7 +204,7 @@ class EntityOwnershipShardCommitCoordinator { } } - private void possiblyPrunePendingCommits(EntityOwnershipShard shard, boolean isLeader) { + private void possiblyPrunePendingCommits(final EntityOwnershipShard shard, final boolean isLeader) { // If we were the leader and transitioned to follower, we'll try to forward pending commits to the new leader. // However certain commits, e.g. entity owner changes, should only be committed by a valid leader as the // criteria used to determine the commit may be stale. Since we're no longer a valid leader, we should not @@ -226,7 +226,7 @@ class EntityOwnershipShardCommitCoordinator { } } - private @Nullable BatchedModifications pruneModifications(BatchedModifications toPrune) { + private @Nullable BatchedModifications pruneModifications(final BatchedModifications toPrune) { BatchedModifications prunedModifications = new BatchedModifications(toPrune.getTransactionId(), toPrune.getVersion()); prunedModifications.setDoCommitOnReady(toPrune.isDoCommitOnReady()); @@ -243,7 +243,7 @@ class EntityOwnershipShardCommitCoordinator { return !prunedModifications.getModifications().isEmpty() ? prunedModifications : null; } - private boolean canForwardModificationToNewLeader(Modification mod) { + private boolean canForwardModificationToNewLeader(final Modification mod) { // If this is a WRITE of entity owner we don't want to forward it to a new leader since the criteria used // to determine the new owner might be stale. if (mod instanceof WriteModification) { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/messages/SelectOwner.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/messages/SelectOwner.java index 8cd4f7853d..cdb8c925ee 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/messages/SelectOwner.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/messages/SelectOwner.java @@ -5,10 +5,10 @@ * 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.datastore.entityownership.messages; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import java.util.Collection; import org.opendaylight.controller.cluster.datastore.entityownership.selectionstrategy.EntityOwnerSelectionStrategy; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; @@ -21,13 +21,12 @@ public class SelectOwner { private final Collection allCandidates; private final EntityOwnerSelectionStrategy ownerSelectionStrategy; - public SelectOwner(YangInstanceIdentifier entityPath, Collection allCandidates, - EntityOwnerSelectionStrategy ownerSelectionStrategy) { - - this.entityPath = Preconditions.checkNotNull(entityPath, "entityPath should not be null"); - this.allCandidates = Preconditions.checkNotNull(allCandidates, "allCandidates should not be null"); - this.ownerSelectionStrategy = Preconditions.checkNotNull(ownerSelectionStrategy, - "ownerSelectionStrategy should not be null"); + public SelectOwner(final YangInstanceIdentifier entityPath, final Collection allCandidates, + final EntityOwnerSelectionStrategy ownerSelectionStrategy) { + this.entityPath = requireNonNull(entityPath, "entityPath should not be null"); + this.allCandidates = requireNonNull(allCandidates, "allCandidates should not be null"); + this.ownerSelectionStrategy = requireNonNull(ownerSelectionStrategy, + "ownerSelectionStrategy should not be null"); } public YangInstanceIdentifier getEntityPath() { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/identifiers/ShardIdentifier.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/identifiers/ShardIdentifier.java index 956fa36d10..7c206adc58 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/identifiers/ShardIdentifier.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/identifiers/ShardIdentifier.java @@ -5,10 +5,11 @@ * 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.datastore.identifiers; -import com.google.common.base.Preconditions; +import static com.google.common.base.Preconditions.checkArgument; +import static java.util.Objects.requireNonNull; + import java.util.regex.Matcher; import java.util.regex.Pattern; import org.opendaylight.controller.cluster.access.concepts.MemberName; @@ -24,9 +25,9 @@ public class ShardIdentifier { private final String fullName; ShardIdentifier(final String shardName, final MemberName memberName, final String type) { - this.shardName = Preconditions.checkNotNull(shardName, "shardName should not be null"); - this.memberName = Preconditions.checkNotNull(memberName, "memberName should not be null"); - this.type = Preconditions.checkNotNull(type, "type should not be null"); + this.shardName = requireNonNull(shardName, "shardName should not be null"); + this.memberName = requireNonNull(memberName, "memberName should not be null"); + this.type = requireNonNull(type, "type should not be null"); fullName = memberName.getName() + "-shard-" + shardName + "-" + type; } @@ -37,7 +38,7 @@ public class ShardIdentifier { public static ShardIdentifier fromShardIdString(final String shardIdString) { final Matcher matcher = PATTERN.matcher(shardIdString); - Preconditions.checkArgument(matcher.matches(), "Invalid shard id \"%s\"", shardIdString); + checkArgument(matcher.matches(), "Invalid shard id \"%s\"", shardIdString); return new ShardIdentifier(matcher.group(2), MemberName.forName(matcher.group(1)), matcher.group(3)); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/OnDemandShardStateCache.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/OnDemandShardStateCache.java index ba00d0b7a5..a830c799c8 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/OnDemandShardStateCache.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/OnDemandShardStateCache.java @@ -7,10 +7,11 @@ */ package org.opendaylight.controller.cluster.datastore.jmx.mbeans.shard; +import static java.util.Objects.requireNonNull; + import akka.actor.ActorRef; import akka.pattern.Patterns; import akka.util.Timeout; -import com.google.common.base.Preconditions; import com.google.common.base.Stopwatch; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; @@ -33,7 +34,7 @@ class OnDemandShardStateCache { private volatile String stateRetrievalTime; OnDemandShardStateCache(final String shardName, final ActorRef shardActor) { - this.shardName = Preconditions.checkNotNull(shardName); + this.shardName = requireNonNull(shardName); this.shardActor = shardActor; } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardDataTreeListenerInfoMXBeanImpl.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardDataTreeListenerInfoMXBeanImpl.java index 282330d7a3..0dadd69e2f 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardDataTreeListenerInfoMXBeanImpl.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/jmx/mbeans/shard/ShardDataTreeListenerInfoMXBeanImpl.java @@ -7,12 +7,13 @@ */ package org.opendaylight.controller.cluster.datastore.jmx.mbeans.shard; +import static java.util.Objects.requireNonNull; + import akka.actor.ActorRef; import akka.actor.ActorSelection; import akka.dispatch.Futures; import akka.pattern.Patterns; import akka.util.Timeout; -import com.google.common.base.Preconditions; import com.google.common.base.Throwables; import java.util.ArrayList; import java.util.Collection; @@ -39,7 +40,7 @@ public class ShardDataTreeListenerInfoMXBeanImpl extends AbstractMXBean implemen public ShardDataTreeListenerInfoMXBeanImpl(final String shardName, final String mxBeanType, final ActorRef shardActor) { super(shardName, mxBeanType, JMX_CATEGORY); - stateCache = new OnDemandShardStateCache(shardName, Preconditions.checkNotNull(shardActor)); + stateCache = new OnDemandShardStateCache(shardName, requireNonNull(shardActor)); } @Override diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/AbstractThreePhaseCommitMessage.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/AbstractThreePhaseCommitMessage.java index ba6b64f4c8..3b45e642ca 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/AbstractThreePhaseCommitMessage.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/AbstractThreePhaseCommitMessage.java @@ -7,7 +7,8 @@ */ package org.opendaylight.controller.cluster.datastore.messages; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; @@ -28,7 +29,7 @@ public abstract class AbstractThreePhaseCommitMessage extends VersionedExternali protected AbstractThreePhaseCommitMessage(final TransactionIdentifier transactionId, final short version) { super(version); - this.transactionId = Preconditions.checkNotNull(transactionId); + this.transactionId = requireNonNull(transactionId); } public TransactionIdentifier getTransactionId() { @@ -36,13 +37,13 @@ public abstract class AbstractThreePhaseCommitMessage extends VersionedExternali } @Override - public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { + public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException { super.readExternal(in); transactionId = TransactionIdentifier.readFrom(in); } @Override - public void writeExternal(ObjectOutput out) throws IOException { + public void writeExternal(final ObjectOutput out) throws IOException { super.writeExternal(out); transactionId.writeTo(out); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ChangeShardMembersVotingStatus.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ChangeShardMembersVotingStatus.java index 0846f7b1c9..92d186a99f 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ChangeShardMembersVotingStatus.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ChangeShardMembersVotingStatus.java @@ -7,7 +7,8 @@ */ package org.opendaylight.controller.cluster.datastore.messages; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import com.google.common.collect.ImmutableMap; import java.util.Map; @@ -20,8 +21,8 @@ public class ChangeShardMembersVotingStatus { private final String shardName; private final Map meberVotingStatusMap; - public ChangeShardMembersVotingStatus(String shardName, Map meberVotingStatusMap) { - this.shardName = Preconditions.checkNotNull(shardName); + public ChangeShardMembersVotingStatus(final String shardName, final Map meberVotingStatusMap) { + this.shardName = requireNonNull(shardName); this.meberVotingStatusMap = ImmutableMap.copyOf(meberVotingStatusMap); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransactionChain.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransactionChain.java index 2fe96cbe67..1e96286eb9 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransactionChain.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransactionChain.java @@ -5,10 +5,11 @@ * 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.datastore.messages; -import com.google.common.base.Preconditions; +import static com.google.common.base.Preconditions.checkArgument; +import static java.util.Objects.requireNonNull; + import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; @@ -26,7 +27,7 @@ public class CloseTransactionChain extends VersionedExternalizableMessage public CloseTransactionChain(final LocalHistoryIdentifier transactionChainId, final short version) { super(version); - this.transactionChainId = Preconditions.checkNotNull(transactionChainId); + this.transactionChainId = requireNonNull(transactionChainId); } @Override @@ -35,23 +36,23 @@ public class CloseTransactionChain extends VersionedExternalizableMessage } @Override - public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { + public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException { super.readExternal(in); transactionChainId = LocalHistoryIdentifier.readFrom(in); } @Override - public void writeExternal(ObjectOutput out) throws IOException { + public void writeExternal(final ObjectOutput out) throws IOException { super.writeExternal(out); transactionChainId.writeTo(out); } public static CloseTransactionChain fromSerializable(final Object serializable) { - Preconditions.checkArgument(serializable instanceof CloseTransactionChain); + checkArgument(serializable instanceof CloseTransactionChain); return (CloseTransactionChain)serializable; } - public static boolean isSerializedType(Object message) { + public static boolean isSerializedType(final Object message) { return message instanceof CloseTransactionChain; } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransaction.java index 52e8824343..3283a55f43 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransaction.java @@ -5,10 +5,11 @@ * 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.datastore.messages; -import com.google.common.base.Preconditions; +import static com.google.common.base.Preconditions.checkArgument; +import static java.util.Objects.requireNonNull; + import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; @@ -23,9 +24,10 @@ public class CreateTransaction extends VersionedExternalizableMessage { public CreateTransaction() { } - public CreateTransaction(TransactionIdentifier transactionId, int transactionType, short version) { + public CreateTransaction(final TransactionIdentifier transactionId, final int transactionType, + final short version) { super(version); - this.transactionId = Preconditions.checkNotNull(transactionId); + this.transactionId = requireNonNull(transactionId); this.transactionType = transactionType; } @@ -38,14 +40,14 @@ public class CreateTransaction extends VersionedExternalizableMessage { } @Override - public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { + public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException { super.readExternal(in); transactionId = TransactionIdentifier.readFrom(in); transactionType = in.readInt(); } @Override - public void writeExternal(ObjectOutput out) throws IOException { + public void writeExternal(final ObjectOutput out) throws IOException { super.writeExternal(out); transactionId.writeTo(out); out.writeInt(transactionType); @@ -56,12 +58,12 @@ public class CreateTransaction extends VersionedExternalizableMessage { return "CreateTransaction [transactionId=" + transactionId + ", transactionType=" + transactionType + "]"; } - public static CreateTransaction fromSerializable(Object message) { - Preconditions.checkArgument(message instanceof CreateTransaction); + public static CreateTransaction fromSerializable(final Object message) { + checkArgument(message instanceof CreateTransaction); return (CreateTransaction)message; } - public static boolean isSerializedType(Object message) { + public static boolean isSerializedType(final Object message) { return message instanceof CreateTransaction; } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/DataTreeChanged.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/DataTreeChanged.java index ff2c89c8dd..03ae771ca1 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/DataTreeChanged.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/DataTreeChanged.java @@ -7,7 +7,8 @@ */ package org.opendaylight.controller.cluster.datastore.messages; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import java.util.Collection; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate; @@ -21,7 +22,7 @@ public final class DataTreeChanged { private final Collection changes; public DataTreeChanged(final Collection changes) { - this.changes = Preconditions.checkNotNull(changes); + this.changes = requireNonNull(changes); } /** diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/DataTreeListenerInfo.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/DataTreeListenerInfo.java index 90db2794d3..62505d9224 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/DataTreeListenerInfo.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/DataTreeListenerInfo.java @@ -7,7 +7,8 @@ */ package org.opendaylight.controller.cluster.datastore.messages; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import java.beans.ConstructorProperties; /** @@ -24,8 +25,8 @@ public class DataTreeListenerInfo { @ConstructorProperties({"listener","registeredPath", "isEnabled", "notificationCount"}) public DataTreeListenerInfo(final String listener, final String registeredPath, final boolean isEnabled, final long notificationCount) { - this.listener = Preconditions.checkNotNull(listener); - this.registeredPath = Preconditions.checkNotNull(registeredPath); + this.listener = requireNonNull(listener); + this.registeredPath = requireNonNull(registeredPath); this.isEnabled = isEnabled; this.notificationCount = notificationCount; } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/FindPrimary.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/FindPrimary.java index 9eba5c6692..52709dd705 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/FindPrimary.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/FindPrimary.java @@ -5,10 +5,10 @@ * 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.datastore.messages; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import java.io.Serializable; /** @@ -20,11 +20,8 @@ public class FindPrimary implements Serializable { private final String shardName; private final boolean waitUntilReady; - public FindPrimary(String shardName, boolean waitUntilReady) { - - Preconditions.checkNotNull(shardName, "shardName should not be null"); - - this.shardName = shardName; + public FindPrimary(final String shardName, final boolean waitUntilReady) { + this.shardName = requireNonNull(shardName, "shardName should not be null"); this.waitUntilReady = waitUntilReady; } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/FlipShardMembersVotingStatus.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/FlipShardMembersVotingStatus.java index 24859a4d16..a4c8d2e1be 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/FlipShardMembersVotingStatus.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/FlipShardMembersVotingStatus.java @@ -7,7 +7,7 @@ */ package org.opendaylight.controller.cluster.datastore.messages; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; /** * A local message sent to the ShardManager to flip the raft voting states for members of a shard. @@ -17,8 +17,8 @@ import com.google.common.base.Preconditions; public class FlipShardMembersVotingStatus { private final String shardName; - public FlipShardMembersVotingStatus(String shardName) { - this.shardName = Preconditions.checkNotNull(shardName); + public FlipShardMembersVotingStatus(final String shardName) { + this.shardName = requireNonNull(shardName); } public String getShardName() { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadyLocalTransactionSerializer.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadyLocalTransactionSerializer.java index 53731fa491..c44f9105c0 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadyLocalTransactionSerializer.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ReadyLocalTransactionSerializer.java @@ -7,10 +7,12 @@ */ package org.opendaylight.controller.cluster.datastore.messages; +import static com.google.common.base.Preconditions.checkArgument; +import static java.util.Objects.requireNonNull; + import akka.actor.ExtendedActorSystem; import akka.serialization.JSerializer; import akka.util.ClassLoaderObjectInputStream; -import com.google.common.base.Preconditions; import java.io.ByteArrayInputStream; import java.io.IOException; import org.apache.commons.lang3.SerializationUtils; @@ -27,7 +29,7 @@ public final class ReadyLocalTransactionSerializer extends JSerializer { private final ExtendedActorSystem system; public ReadyLocalTransactionSerializer(final ExtendedActorSystem system) { - this.system = Preconditions.checkNotNull(system); + this.system = requireNonNull(system); } @Override @@ -42,7 +44,7 @@ public final class ReadyLocalTransactionSerializer extends JSerializer { @Override public byte[] toBinary(final Object obj) { - Preconditions.checkArgument(obj instanceof ReadyLocalTransaction, "Unsupported object type %s", obj.getClass()); + checkArgument(obj instanceof ReadyLocalTransaction, "Unsupported object type %s", obj.getClass()); final ReadyLocalTransaction readyLocal = (ReadyLocalTransaction) obj; final BatchedModifications batched = new BatchedModifications(readyLocal.getTransactionId(), readyLocal.getRemoteVersion()); @@ -69,7 +71,7 @@ public final class ReadyLocalTransactionSerializer extends JSerializer { private final BatchedModifications message; BatchedCursor(final BatchedModifications message) { - this.message = Preconditions.checkNotNull(message); + this.message = requireNonNull(message); } @Override diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/RegisterDataTreeNotificationListenerReply.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/RegisterDataTreeNotificationListenerReply.java index 7642a90c5f..7feb6c46e6 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/RegisterDataTreeNotificationListenerReply.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/RegisterDataTreeNotificationListenerReply.java @@ -7,9 +7,10 @@ */ package org.opendaylight.controller.cluster.datastore.messages; +import static java.util.Objects.requireNonNull; + import akka.actor.ActorPath; import akka.actor.ActorRef; -import com.google.common.base.Preconditions; import java.io.Serializable; /** @@ -23,7 +24,7 @@ public class RegisterDataTreeNotificationListenerReply implements Serializable { private final ActorRef listenerRegistrationPath; public RegisterDataTreeNotificationListenerReply(final ActorRef listenerRegistrationPath) { - this.listenerRegistrationPath = Preconditions.checkNotNull(listenerRegistrationPath); + this.listenerRegistrationPath = requireNonNull(listenerRegistrationPath); } public ActorPath getListenerRegistrationPath() { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractDataTreeCandidateNode.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractDataTreeCandidateNode.java index 640ce37245..8ef201c314 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractDataTreeCandidateNode.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractDataTreeCandidateNode.java @@ -7,7 +7,8 @@ */ package org.opendaylight.controller.cluster.datastore.persisted; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import java.util.Collection; import java.util.Optional; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; @@ -26,7 +27,7 @@ abstract class AbstractDataTreeCandidateNode implements DataTreeCandidateNode { private final ModificationType type; protected AbstractDataTreeCandidateNode(final ModificationType type) { - this.type = Preconditions.checkNotNull(type); + this.type = requireNonNull(type); } @Override diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractIdentifiablePayload.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractIdentifiablePayload.java index 1f755506a5..4ca35098c5 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractIdentifiablePayload.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractIdentifiablePayload.java @@ -9,7 +9,6 @@ package org.opendaylight.controller.cluster.datastore.persisted; import static java.util.Objects.requireNonNull; -import com.google.common.base.Preconditions; import com.google.common.base.Verify; import com.google.common.io.ByteStreams; import java.io.DataInput; @@ -40,7 +39,7 @@ public abstract class AbstractIdentifiablePayload } protected AbstractProxy(final byte[] serialized) { - this.serialized = Preconditions.checkNotNull(serialized); + this.serialized = requireNonNull(serialized); } @Override diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/CommitTransactionPayload.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/CommitTransactionPayload.java index 4d38c35d48..aaa86413be 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/CommitTransactionPayload.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/CommitTransactionPayload.java @@ -7,9 +7,10 @@ */ package org.opendaylight.controller.cluster.datastore.persisted; +import static java.util.Objects.requireNonNull; + import com.google.common.annotations.Beta; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Preconditions; import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; import java.io.DataInput; @@ -49,7 +50,7 @@ public final class CommitTransactionPayload extends Payload implements Serializa } Proxy(final byte[] serialized) { - this.serialized = Preconditions.checkNotNull(serialized); + this.serialized = requireNonNull(serialized); } @Override @@ -75,7 +76,7 @@ public final class CommitTransactionPayload extends Payload implements Serializa private final byte[] serialized; CommitTransactionPayload(final byte[] serialized) { - this.serialized = Preconditions.checkNotNull(serialized); + this.serialized = requireNonNull(serialized); } public static CommitTransactionPayload create(final TransactionIdentifier transactionId, diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/FrontendClientMetadata.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/FrontendClientMetadata.java index 4598f68a44..a3f41ed65d 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/FrontendClientMetadata.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/FrontendClientMetadata.java @@ -7,8 +7,9 @@ */ package org.opendaylight.controller.cluster.datastore.persisted; +import static java.util.Objects.requireNonNull; + import com.google.common.base.MoreObjects; -import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableRangeSet; import com.google.common.collect.ImmutableRangeSet.Builder; @@ -33,7 +34,7 @@ public final class FrontendClientMetadata implements Identifiable purgedHistories, final Collection currentHistories) { - this.identifier = Preconditions.checkNotNull(identifier); + this.identifier = requireNonNull(identifier); this.purgedHistories = ImmutableRangeSet.copyOf(purgedHistories); this.currentHistories = ImmutableList.copyOf(currentHistories); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ModifiedDataTreeCandidateNode.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ModifiedDataTreeCandidateNode.java index 6820e1c885..2cede0db5e 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ModifiedDataTreeCandidateNode.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ModifiedDataTreeCandidateNode.java @@ -7,7 +7,8 @@ */ package org.opendaylight.controller.cluster.datastore.persisted; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import java.util.Collection; import java.util.Optional; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; @@ -25,7 +26,7 @@ abstract class ModifiedDataTreeCandidateNode extends AbstractDataTreeCandidateNo private ModifiedDataTreeCandidateNode(final ModificationType type, final Collection children) { super(type); - this.children = Preconditions.checkNotNull(children); + this.children = requireNonNull(children); } static DataTreeCandidateNode create(final ModificationType type, final Collection children) { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/AbstractShardManagerCreator.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/AbstractShardManagerCreator.java index eb6ebb3d62..0285b264c4 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/AbstractShardManagerCreator.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/AbstractShardManagerCreator.java @@ -7,8 +7,10 @@ */ package org.opendaylight.controller.cluster.datastore.shardmanager; +import static com.google.common.base.Preconditions.checkState; +import static java.util.Objects.requireNonNull; + import akka.actor.Props; -import com.google.common.base.Preconditions; import java.util.concurrent.CountDownLatch; import org.opendaylight.controller.cluster.datastore.AbstractDataStore; import org.opendaylight.controller.cluster.datastore.ClusterWrapper; @@ -37,14 +39,14 @@ public abstract class AbstractShardManagerCreator rangeset; private UnsignedLongRangeSet(final RangeSet rangeset) { - this.rangeset = Preconditions.checkNotNull(rangeset); + this.rangeset = requireNonNull(rangeset); } public static UnsignedLongRangeSet create() { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardModification.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardModification.java index 4a36c386b1..1592dc7dd3 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardModification.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardModification.java @@ -5,10 +5,10 @@ * 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 java.util.Map; import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier; import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteCursor; @@ -33,8 +33,8 @@ public class DistributedShardModification extends WriteableNodeWithSubshard { final Map subshards, final Map childShards) { super(subshards); - this.context = Preconditions.checkNotNull(context); - this.childShards = Preconditions.checkNotNull(childShards); + this.context = requireNonNull(context); + this.childShards = requireNonNull(childShards); } @Override diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardModificationFactory.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardModificationFactory.java index 8fc1f4863d..37ac32ac3e 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardModificationFactory.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/DistributedShardModificationFactory.java @@ -5,11 +5,11 @@ * 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 static java.util.Objects.requireNonNull; + import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import java.util.Map; import org.opendaylight.controller.cluster.databroker.actors.dds.ClientTransaction; @@ -29,7 +29,7 @@ public final class DistributedShardModificationFactory { DistributedShardModificationFactory(final DOMDataTreeIdentifier root, final Map children, final Map childShards) { - this.root = Preconditions.checkNotNull(root); + this.root = requireNonNull(root); this.children = ImmutableMap.copyOf(children); this.childShards = ImmutableMap.copyOf(childShards); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/PrefixedShardConfigUpdateHandler.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/PrefixedShardConfigUpdateHandler.java index 7dbdd290e6..d7d75c2475 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/PrefixedShardConfigUpdateHandler.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/PrefixedShardConfigUpdateHandler.java @@ -5,16 +5,15 @@ * 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 static akka.actor.ActorRef.noSender; +import static java.util.Objects.requireNonNull; import static org.opendaylight.controller.cluster.datastore.utils.ClusterUtils.SHARD_PREFIX_QNAME; import static org.opendaylight.controller.cluster.datastore.utils.ClusterUtils.SHARD_REPLICAS_QNAME; import static org.opendaylight.controller.cluster.datastore.utils.ClusterUtils.SHARD_REPLICA_QNAME; import akka.actor.ActorRef; -import com.google.common.base.Preconditions; import java.util.Collection; import java.util.EnumMap; import java.util.List; @@ -57,8 +56,8 @@ public class PrefixedShardConfigUpdateHandler { new EnumMap<>(LogicalDatastoreType.class); public PrefixedShardConfigUpdateHandler(final ActorRef handlingActor, final MemberName memberName) { - this.handlingActor = Preconditions.checkNotNull(handlingActor); - this.memberName = Preconditions.checkNotNull(memberName); + this.handlingActor = requireNonNull(handlingActor); + this.memberName = requireNonNull(memberName); } public void initListener(final AbstractDataStore dataStore, final LogicalDatastoreType type) { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/RoleChangeListenerActor.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/RoleChangeListenerActor.java index d33ad50c09..8ad10bc5e7 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/RoleChangeListenerActor.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/RoleChangeListenerActor.java @@ -5,12 +5,12 @@ * 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 static java.util.Objects.requireNonNull; + import akka.actor.ActorRef; import akka.actor.Props; -import com.google.common.base.Preconditions; import org.opendaylight.controller.cluster.common.actor.AbstractUntypedActor; import org.opendaylight.controller.cluster.dom.api.LeaderLocation; import org.opendaylight.controller.cluster.dom.api.LeaderLocationListener; @@ -30,8 +30,8 @@ public final class RoleChangeListenerActor extends AbstractUntypedActor { private final ActorRef roleChangeNotifier; private RoleChangeListenerActor(final ActorRef roleChangeNotifier, final LeaderLocationListener listener) { - this.roleChangeNotifier = Preconditions.checkNotNull(roleChangeNotifier); - this.leaderLocationListener = Preconditions.checkNotNull(listener); + this.roleChangeNotifier = requireNonNull(roleChangeNotifier); + this.leaderLocationListener = requireNonNull(listener); } @Override diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/ShardProxyTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/ShardProxyTransaction.java index a9a6ce836e..f60fac4059 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/ShardProxyTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/ShardProxyTransaction.java @@ -7,9 +7,10 @@ */ package org.opendaylight.controller.cluster.sharding; +import static com.google.common.base.Preconditions.checkArgument; +import static com.google.common.base.Preconditions.checkState; import static java.util.Objects.requireNonNull; -import com.google.common.base.Preconditions; import com.google.common.util.concurrent.AsyncFunction; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; @@ -91,7 +92,7 @@ class ShardProxyTransaction implements DOMDataTreeShardWriteTransaction { private YangInstanceIdentifier toRelative(final YangInstanceIdentifier path) { final Optional relative = path.relativeTo(modification.getPrefix().getRootIdentifier()); - Preconditions.checkArgument(relative.isPresent()); + checkArgument(relative.isPresent()); return relative.get(); } @@ -99,7 +100,7 @@ class ShardProxyTransaction implements DOMDataTreeShardWriteTransaction { public void ready() { LOG.debug("Readying transaction for shard {}", shardRoot); - Preconditions.checkNotNull(modification, "Attempting to ready an empty transaction."); + requireNonNull(modification, "Attempting to ready an empty transaction."); cohorts.add(modification.seal()); for (Entry entry @@ -136,7 +137,7 @@ class ShardProxyTransaction implements DOMDataTreeShardWriteTransaction { } private void checkTransactionReadied() { - Preconditions.checkState(!cohorts.isEmpty(), "Transaction not readied yet"); + checkState(!cohorts.isEmpty(), "Transaction not readied yet"); } @Override diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/ShardedDataTreeActor.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/ShardedDataTreeActor.java index bad52b3ec2..845104ea7b 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/ShardedDataTreeActor.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/ShardedDataTreeActor.java @@ -7,6 +7,8 @@ */ package org.opendaylight.controller.cluster.sharding; +import static java.util.Objects.requireNonNull; + import akka.actor.ActorRef; import akka.actor.ActorSelection; import akka.actor.ActorSystem; @@ -25,7 +27,6 @@ import akka.cluster.Member; import akka.dispatch.OnComplete; import akka.pattern.Patterns; import akka.util.Timeout; -import com.google.common.base.Preconditions; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -812,11 +813,11 @@ public class ShardedDataTreeActor extends AbstractUntypedPersistentActor { } private void verify() { - Preconditions.checkNotNull(shardingService); - Preconditions.checkNotNull(actorSystem); - Preconditions.checkNotNull(cluster); - Preconditions.checkNotNull(distributedConfigDatastore); - Preconditions.checkNotNull(distributedOperDatastore); + requireNonNull(shardingService); + requireNonNull(actorSystem); + requireNonNull(cluster); + requireNonNull(distributedConfigDatastore); + requireNonNull(distributedOperDatastore); } public Props props() { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/ShardingServiceAddressResolver.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/ShardingServiceAddressResolver.java index b443a69e1f..379940db6a 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/ShardingServiceAddressResolver.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/ShardingServiceAddressResolver.java @@ -5,11 +5,12 @@ * 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 static com.google.common.base.Preconditions.checkNotNull; +import static java.util.Objects.requireNonNull; + import akka.actor.Address; -import com.google.common.base.Preconditions; import java.util.Collection; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; @@ -60,11 +61,8 @@ public class ShardingServiceAddressResolver { } public String resolve(final MemberName memberName) { - Preconditions.checkNotNull(memberName); - final Address address = memberNameToAddress.get(memberName); - Preconditions.checkNotNull(address, "Requested member[%s] is not present in the resolver ", - memberName.toString()); - + final Address address = memberNameToAddress.get(requireNonNull(memberName)); + checkNotNull(address, "Requested member[%s] is not present in the resolver", memberName); return getActorPathBuilder(address).toString(); } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/messages/LookupPrefixShard.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/messages/LookupPrefixShard.java index 9ea641c865..eafb0b9031 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/messages/LookupPrefixShard.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/messages/LookupPrefixShard.java @@ -5,11 +5,11 @@ * 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.messages; +import static java.util.Objects.requireNonNull; + import com.google.common.annotations.Beta; -import com.google.common.base.Preconditions; import java.io.Serializable; import org.opendaylight.controller.cluster.sharding.ShardedDataTreeActor; import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier; @@ -26,7 +26,7 @@ public class LookupPrefixShard implements Serializable { private final DOMDataTreeIdentifier prefix; public LookupPrefixShard(final DOMDataTreeIdentifier prefix) { - this.prefix = Preconditions.checkNotNull(prefix); + this.prefix = requireNonNull(prefix); } public DOMDataTreeIdentifier getPrefix() { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/messages/NotifyProducerCreated.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/messages/NotifyProducerCreated.java index fb7f017642..833fd0ea64 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/messages/NotifyProducerCreated.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/messages/NotifyProducerCreated.java @@ -5,11 +5,9 @@ * 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.messages; import com.google.common.annotations.Beta; -import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import java.io.Serializable; import java.util.Collection; @@ -27,7 +25,7 @@ public class NotifyProducerCreated implements Serializable { private final Collection subtrees; public NotifyProducerCreated(final Collection subtrees) { - this.subtrees = ImmutableList.copyOf(Preconditions.checkNotNull(subtrees)); + this.subtrees = ImmutableList.copyOf(subtrees); } public Collection getSubtrees() { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/messages/NotifyProducerRemoved.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/messages/NotifyProducerRemoved.java index 24d871edad..18af2c79cd 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/messages/NotifyProducerRemoved.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/messages/NotifyProducerRemoved.java @@ -5,11 +5,9 @@ * 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.messages; import com.google.common.annotations.Beta; -import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import java.io.Serializable; import java.util.Collection; @@ -27,7 +25,7 @@ public class NotifyProducerRemoved implements Serializable { private final Collection subtrees; public NotifyProducerRemoved(final Collection subtrees) { - this.subtrees = ImmutableList.copyOf(Preconditions.checkNotNull(subtrees)); + this.subtrees = ImmutableList.copyOf(subtrees); } public Collection getSubtrees() { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/messages/PrefixShardRemovalLookup.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/messages/PrefixShardRemovalLookup.java index d6a4319c0b..de49217d3a 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/messages/PrefixShardRemovalLookup.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/messages/PrefixShardRemovalLookup.java @@ -5,10 +5,10 @@ * 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.messages; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import org.opendaylight.controller.cluster.sharding.ShardedDataTreeActor; import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier; @@ -17,12 +17,10 @@ import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier; * the system entirely the actor responds with a success. */ public class PrefixShardRemovalLookup { - private final DOMDataTreeIdentifier prefix; public PrefixShardRemovalLookup(final DOMDataTreeIdentifier prefix) { - - this.prefix = Preconditions.checkNotNull(prefix); + this.prefix = requireNonNull(prefix); } public DOMDataTreeIdentifier getPrefix() { @@ -31,8 +29,6 @@ public class PrefixShardRemovalLookup { @Override public String toString() { - return "PrefixShardRemovalLookup{" - + "prefix=" + prefix - + '}'; + return "PrefixShardRemovalLookup{" + "prefix=" + prefix + '}'; } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DatastoreContextIntrospectorTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DatastoreContextIntrospectorTest.java index 14866d447a..6d661e6aa2 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DatastoreContextIntrospectorTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DatastoreContextIntrospectorTest.java @@ -23,7 +23,6 @@ import static org.opendaylight.mdsal.common.api.LogicalDatastoreType.OPERATIONAL import java.util.Arrays; import java.util.HashMap; -import java.util.Hashtable; import java.util.Map; import org.junit.Test; import org.opendaylight.mdsal.binding.generator.impl.GeneratedClassLoadingStrategy; @@ -157,7 +156,7 @@ public class DatastoreContextIntrospectorTest { updated = introspector.update(null); assertFalse("updated", updated); - updated = introspector.update(new Hashtable<>()); + updated = introspector.update(new HashMap<>()); assertFalse("updated", updated); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/MemberNode.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/MemberNode.java index 35ddd7e779..ab7de92484 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/MemberNode.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/MemberNode.java @@ -7,6 +7,7 @@ */ package org.opendaylight.controller.cluster.datastore; +import static java.util.Objects.requireNonNull; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -17,12 +18,11 @@ import akka.cluster.Cluster; import akka.cluster.ClusterEvent.CurrentClusterState; import akka.cluster.Member; import akka.cluster.MemberStatus; -import com.google.common.base.Preconditions; import com.google.common.base.Stopwatch; -import com.google.common.collect.Sets; import com.google.common.util.concurrent.Uninterruptibles; import com.typesafe.config.Config; import com.typesafe.config.ConfigFactory; +import java.util.HashSet; import java.util.List; import java.util.Optional; import java.util.Set; @@ -157,7 +157,7 @@ public class MemberNode { public static void verifyRaftPeersPresent(final AbstractDataStore datastore, final String shardName, final String... peerMemberNames) throws Exception { - final Set peerIds = Sets.newHashSet(); + final Set peerIds = new HashSet<>(); for (String p: peerMemberNames) { peerIds.add(ShardIdentifier.create(shardName, MemberName.forName(p), datastore.getActorUtils().getDataStoreName()).toString()); @@ -278,9 +278,9 @@ public class MemberNode { } public MemberNode build() throws Exception { - Preconditions.checkNotNull(moduleShardsConfig, "moduleShardsConfig must be specified"); - Preconditions.checkNotNull(akkaConfig, "akkaConfig must be specified"); - Preconditions.checkNotNull(testName, "testName must be specified"); + requireNonNull(moduleShardsConfig, "moduleShardsConfig must be specified"); + requireNonNull(akkaConfig, "akkaConfig must be specified"); + requireNonNull(testName, "testName must be specified"); if (schemaContext == null) { schemaContext = SchemaContextHelper.full(); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardDataTreeTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardDataTreeTest.java index 35cb8ed629..731aa72604 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardDataTreeTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardDataTreeTest.java @@ -5,7 +5,6 @@ * 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.datastore; import static org.junit.Assert.assertEquals; @@ -34,12 +33,12 @@ import static org.opendaylight.controller.cluster.datastore.ShardDataTreeMocking import static org.opendaylight.controller.cluster.datastore.ShardDataTreeMocking.immediatePreCommit; import com.google.common.base.Ticker; -import com.google.common.collect.Maps; import com.google.common.primitives.UnsignedLong; import com.google.common.util.concurrent.FutureCallback; import java.math.BigInteger; import java.util.ArrayList; import java.util.Collection; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; @@ -199,7 +198,7 @@ public class ShardDataTreeTest extends AbstractTest { shardDataTree.applySnapshot(newDataTree.takeStateSnapshot()); - Map expChanges = Maps.newHashMap(); + Map expChanges = new HashMap<>(); expChanges.put(CarsModel.newCarPath("optima"), ModificationType.WRITE); expChanges.put(CarsModel.newCarPath("murano"), ModificationType.WRITE); expChanges.put(CarsModel.newCarPath("sportage"), ModificationType.DELETE); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ThreePhaseCommitCohortProxyTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ThreePhaseCommitCohortProxyTest.java index b7a303e8d2..13d3882a04 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ThreePhaseCommitCohortProxyTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ThreePhaseCommitCohortProxyTest.java @@ -5,9 +5,9 @@ * 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.datastore; +import static java.util.Objects.requireNonNull; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; @@ -22,7 +22,6 @@ import akka.dispatch.Futures; import akka.testkit.TestActorRef; import com.codahale.metrics.Snapshot; import com.codahale.metrics.Timer; -import com.google.common.base.Preconditions; import com.google.common.base.Throwables; import com.google.common.util.concurrent.ListenableFuture; import java.util.ArrayList; @@ -383,7 +382,7 @@ public class ThreePhaseCommitCohortProxyTest extends AbstractActorTest { private final TransactionIdentifier transactionId; Builder(final TransactionIdentifier transactionId) { - this.transactionId = Preconditions.checkNotNull(transactionId); + this.transactionId = requireNonNull(transactionId); } Builder expectCanCommit(final Class newExpCanCommitType, final Object newCanCommitReply) { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerTest.java index 1efb1e9df4..9a02347689 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerTest.java @@ -43,7 +43,6 @@ import akka.serialization.Serialization; import akka.testkit.TestActorRef; import akka.testkit.javadsl.TestKit; import akka.util.Timeout; -import com.google.common.base.Function; import com.google.common.base.Stopwatch; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; @@ -64,6 +63,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.function.Consumer; +import java.util.function.Function; import java.util.stream.Collectors; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -1363,10 +1363,8 @@ public class ShardManagerTest extends AbstractShardManagerTest { assertEquals("getType", shardMrgIDSuffix, datastoreSnapshot.getType()); assertNull("Expected null ShardManagerSnapshot", datastoreSnapshot.getShardManagerSnapshot()); - Function shardNameTransformer = ShardSnapshot::getName; - assertEquals("Shard names", Sets.newHashSet("shard1", "shard2"), Sets.newHashSet( - datastoreSnapshot.getShardSnapshots().stream().map(shardNameTransformer).collect(Collectors.toSet()))); + datastoreSnapshot.getShardSnapshots().stream().map(ShardSnapshot::getName).collect(Collectors.toSet()))); // Add a new replica @@ -1387,7 +1385,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { datastoreSnapshot = expectMsgClassOrFailure(DatastoreSnapshot.class, kit, "GetSnapshot"); assertEquals("Shard names", Sets.newHashSet("shard1", "shard2", "astronauts"), Sets.newHashSet( - Lists.transform(datastoreSnapshot.getShardSnapshots(), shardNameTransformer))); + Lists.transform(datastoreSnapshot.getShardSnapshots(), ShardSnapshot::getName))); ShardManagerSnapshot snapshot = datastoreSnapshot.getShardManagerSnapshot(); assertNotNull("Expected ShardManagerSnapshot", snapshot); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/ActorUtilsTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/ActorUtilsTest.java index b4f725a3c4..1f60cdfae4 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/ActorUtilsTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/ActorUtilsTest.java @@ -29,11 +29,11 @@ import akka.japi.Creator; import akka.testkit.TestActorRef; import akka.testkit.javadsl.TestKit; import akka.util.Timeout; -import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.typesafe.config.ConfigFactory; import java.time.Duration; import java.util.Arrays; +import java.util.HashMap; import java.util.Map; import java.util.Optional; import java.util.concurrent.TimeUnit; @@ -74,10 +74,9 @@ public class ActorUtilsTest extends AbstractActorTest { } private static final class MockShardManager extends UntypedAbstractActor { - + private final Map findPrimaryResponses = new HashMap<>(); private final boolean found; private final ActorRef actorRef; - private final Map findPrimaryResponses = Maps.newHashMap(); private MockShardManager(final boolean found, final ActorRef actorRef) { diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/AbstractDOMForwardedCompositeTransaction.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/AbstractDOMForwardedCompositeTransaction.java index d3b0e4828a..4924e092ba 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/AbstractDOMForwardedCompositeTransaction.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/AbstractDOMForwardedCompositeTransaction.java @@ -5,10 +5,11 @@ * 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.base.Preconditions; +import static com.google.common.base.Preconditions.checkArgument; +import static java.util.Objects.requireNonNull; + import java.util.Collection; import java.util.Map; import org.opendaylight.controller.md.sal.common.api.data.AsyncTransaction; @@ -45,8 +46,8 @@ abstract class AbstractDOMForwardedCompositeTransaction backingTxs) { - this.identifier = Preconditions.checkNotNull(identifier, "Identifier should not be null"); - this.backingTxs = Preconditions.checkNotNull(backingTxs, "Backing transactions should not be null"); + this.identifier = requireNonNull(identifier, "Identifier should not be null"); + this.backingTxs = requireNonNull(backingTxs, "Backing transactions should not be null"); } /** @@ -60,10 +61,8 @@ abstract class AbstractDOMForwardedCompositeTransaction> implementations) { - this.schemaPath = Preconditions.checkNotNull(schemaPath); - this.implementations = Preconditions.checkNotNull(implementations); + this.schemaPath = requireNonNull(schemaPath); + this.implementations = requireNonNull(implementations); } final SchemaPath getSchemaPath() { diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/CommitCoordinationTask.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/CommitCoordinationTask.java index ea581ee89a..fec0a7687f 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/CommitCoordinationTask.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/CommitCoordinationTask.java @@ -5,10 +5,10 @@ * 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.base.Preconditions; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Supplier; import com.google.common.base.Throwables; import com.google.common.util.concurrent.Futures; @@ -45,8 +45,8 @@ final class CommitCoordinationTask implements Callable { final Collection cohorts, final DurationStatisticsTracker commitStatTracker, final Supplier futureValueSupplier) { - this.tx = Preconditions.checkNotNull(transaction, "transaction must not be null"); - this.cohorts = Preconditions.checkNotNull(cohorts, "cohorts must not be null"); + this.tx = requireNonNull(transaction, "transaction must not be null"); + this.cohorts = requireNonNull(cohorts, "cohorts must not be null"); this.commitStatTracker = commitStatTracker; this.futureValueSupplier = futureValueSupplier; } diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMDataBrokerTransactionChainImpl.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMDataBrokerTransactionChainImpl.java index d75ad263f5..6e11c5f5bf 100755 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMDataBrokerTransactionChainImpl.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMDataBrokerTransactionChainImpl.java @@ -5,10 +5,11 @@ * 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.base.Preconditions; +import static com.google.common.base.Preconditions.checkState; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Supplier; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; @@ -71,12 +72,12 @@ final class DOMDataBrokerTransactionChainImpl extends final TransactionChainListener listener) { super(chains); this.chainId = chainId; - this.broker = Preconditions.checkNotNull(broker); - this.listener = Preconditions.checkNotNull(listener); + this.broker = requireNonNull(broker); + this.listener = requireNonNull(listener); } private void checkNotFailed() { - Preconditions.checkState(state != State.FAILED, "Transaction chain has failed"); + checkState(state != State.FAILED, "Transaction chain has failed"); } @Override diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMForwardedWriteTransaction.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMForwardedWriteTransaction.java index 19570a2fa2..27267b969f 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMForwardedWriteTransaction.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMForwardedWriteTransaction.java @@ -7,7 +7,9 @@ */ package org.opendaylight.controller.md.sal.dom.broker.impl; -import com.google.common.base.Preconditions; +import static com.google.common.base.Preconditions.checkState; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Supplier; import com.google.common.util.concurrent.FluentFuture; import com.google.common.util.concurrent.Futures; @@ -85,7 +87,7 @@ class DOMForwardedWriteTransaction extends protected DOMForwardedWriteTransaction(final Object identifier, final Map backingTxs, final AbstractDOMForwardedTransactionFactory commitImpl) { super(identifier, backingTxs); - this.commitImpl = Preconditions.checkNotNull(commitImpl, "commitImpl must not be null."); + this.commitImpl = requireNonNull(commitImpl, "commitImpl must not be null."); } @Override @@ -134,7 +136,7 @@ class DOMForwardedWriteTransaction extends } @SuppressWarnings("checkstyle:IllegalCatch") - private ListenableFuture doCommit(Supplier futureValueSupplier) { + private ListenableFuture doCommit(final Supplier futureValueSupplier) { final AbstractDOMForwardedTransactionFactory impl = IMPL_UPDATER.getAndSet(this, null); checkRunning(impl); @@ -157,6 +159,6 @@ class DOMForwardedWriteTransaction extends } private void checkRunning(final AbstractDOMForwardedTransactionFactory impl) { - Preconditions.checkState(impl != null, "Transaction %s is no longer running", getIdentifier()); + checkState(impl != null, "Transaction %s is no longer running", getIdentifier()); } } diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMNotificationRouterEvent.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMNotificationRouterEvent.java index c241c95015..47ff2c2869 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMNotificationRouterEvent.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMNotificationRouterEvent.java @@ -7,7 +7,8 @@ */ package org.opendaylight.controller.md.sal.dom.broker.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; import com.lmax.disruptor.EventFactory; @@ -40,8 +41,8 @@ final class DOMNotificationRouterEvent { ListenableFuture initialize(final DOMNotification notification, final Collection> subscribers) { - this.notification = Preconditions.checkNotNull(notification); - this.subscribers = Preconditions.checkNotNull(subscribers); + this.notification = requireNonNull(notification); + this.subscribers = requireNonNull(subscribers); this.future = SettableFuture.create(); return this.future; } diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMRpcRoutingTable.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMRpcRoutingTable.java index 6e6d45b3c0..724276f6b8 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMRpcRoutingTable.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/DOMRpcRoutingTable.java @@ -7,7 +7,8 @@ */ package org.opendaylight.controller.md.sal.dom.broker.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap.Builder; import com.google.common.collect.LinkedListMultimap; @@ -47,7 +48,7 @@ final class DOMRpcRoutingTable { private DOMRpcRoutingTable(final Map rpcs, final SchemaContext schemaContext) { - this.rpcs = Preconditions.checkNotNull(rpcs); + this.rpcs = requireNonNull(rpcs); this.schemaContext = schemaContext; } diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/GlobalDOMRpcRoutingTableEntry.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/GlobalDOMRpcRoutingTableEntry.java index 6819fdd645..d616fb896b 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/GlobalDOMRpcRoutingTableEntry.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/GlobalDOMRpcRoutingTableEntry.java @@ -7,7 +7,8 @@ */ package org.opendaylight.controller.md.sal.dom.broker.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import com.google.common.util.concurrent.CheckedFuture; import java.util.List; import java.util.Map; @@ -26,7 +27,7 @@ final class GlobalDOMRpcRoutingTableEntry extends AbstractDOMRpcRoutingTableEntr private GlobalDOMRpcRoutingTableEntry(final DOMRpcIdentifier rpcId, final Map> impls) { super(rpcId.getType(), impls); - this.rpcId = Preconditions.checkNotNull(rpcId); + this.rpcId = requireNonNull(rpcId); } // We do not need the RpcDefinition, but this makes sure we do not diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongTransaction.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongTransaction.java index 1ca312489b..22625ed156 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongTransaction.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongTransaction.java @@ -7,9 +7,10 @@ */ package org.opendaylight.controller.md.sal.dom.broker.impl; +import static java.util.Objects.requireNonNull; + import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects.ToStringHelper; -import com.google.common.base.Preconditions; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; @@ -28,7 +29,7 @@ final class PingPongTransaction implements FutureCallback { private DOMDataReadWriteTransaction frontendTransaction; PingPongTransaction(final DOMDataReadWriteTransaction delegate) { - this.delegate = Preconditions.checkNotNull(delegate); + this.delegate = requireNonNull(delegate); future = SettableFuture.create(); } diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/RoutedDOMRpcRoutingTableEntry.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/RoutedDOMRpcRoutingTableEntry.java index ae34b91017..b4ae1cf559 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/RoutedDOMRpcRoutingTableEntry.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/RoutedDOMRpcRoutingTableEntry.java @@ -7,7 +7,8 @@ */ package org.opendaylight.controller.md.sal.dom.broker.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import com.google.common.util.concurrent.CheckedFuture; import com.google.common.util.concurrent.Futures; import java.util.List; @@ -34,14 +35,14 @@ final class RoutedDOMRpcRoutingTableEntry extends AbstractDOMRpcRoutingTableEntr private RoutedDOMRpcRoutingTableEntry(final DOMRpcIdentifier globalRpcId, final YangInstanceIdentifier keyId, final Map> impls) { super(globalRpcId.getType(), impls); - this.keyId = Preconditions.checkNotNull(keyId); - this.globalRpcId = Preconditions.checkNotNull(globalRpcId); + this.keyId = requireNonNull(keyId); + this.globalRpcId = requireNonNull(globalRpcId); } RoutedDOMRpcRoutingTableEntry(final RpcDefinition def, final YangInstanceIdentifier keyId, final Map> impls) { super(def.getPath(), impls); - this.keyId = Preconditions.checkNotNull(keyId); + this.keyId = requireNonNull(keyId); this.globalRpcId = DOMRpcIdentifier.create(def.getPath()); } diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/SerializedDOMDataBroker.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/SerializedDOMDataBroker.java index 1d5912cc6a..b28ca701a2 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/SerializedDOMDataBroker.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/SerializedDOMDataBroker.java @@ -5,10 +5,11 @@ * 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.base.Preconditions; +import static com.google.common.base.Preconditions.checkArgument; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Supplier; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; @@ -55,7 +56,7 @@ public class SerializedDOMDataBroker extends AbstractDOMDataBroker { public SerializedDOMDataBroker(final Map datastores, final ListeningExecutorService executor) { super(datastores); - this.executor = Preconditions.checkNotNull(executor, "executor must not be null."); + this.executor = requireNonNull(executor, "executor must not be null."); } public DurationStatisticsTracker getCommitStatsTracker() { @@ -65,8 +66,8 @@ public class SerializedDOMDataBroker extends AbstractDOMDataBroker { @Override protected ListenableFuture commit(final DOMDataWriteTransaction transaction, final Collection cohorts, final Supplier futureValueSupplier) { - Preconditions.checkArgument(transaction != null, "Transaction must not be null."); - Preconditions.checkArgument(cohorts != null, "Cohorts must not be null."); + checkArgument(transaction != null, "Transaction must not be null."); + checkArgument(cohorts != null, "Cohorts must not be null."); LOG.debug("Tx: {} is submitted for execution.", transaction.getIdentifier()); ListenableFuture commitFuture; diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/LegacyShardedDOMDataBrokerAdapter.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/LegacyShardedDOMDataBrokerAdapter.java index 4d7ff0a78b..747d8a02a7 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/LegacyShardedDOMDataBrokerAdapter.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/LegacyShardedDOMDataBrokerAdapter.java @@ -7,7 +7,7 @@ */ package org.opendaylight.controller.md.sal.dom.broker.impl.legacy.sharded.adapter; -import static com.google.common.base.Preconditions.checkNotNull; +import static java.util.Objects.requireNonNull; import java.util.Collections; import java.util.Map; @@ -45,8 +45,8 @@ public class LegacyShardedDOMDataBrokerAdapter implements DOMDataBroker { public LegacyShardedDOMDataBrokerAdapter(final ShardedDOMDataBrokerAdapter delegateDataBroker, final DOMSchemaService schemaService) { - this.delegateDataBroker = checkNotNull(delegateDataBroker); - this.schemaService = checkNotNull(schemaService); + this.delegateDataBroker = requireNonNull(delegateDataBroker); + this.schemaService = requireNonNull(schemaService); } @Override diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingReadTransaction.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingReadTransaction.java index 59df7239cf..d73a71df91 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingReadTransaction.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingReadTransaction.java @@ -7,7 +7,7 @@ */ package org.opendaylight.controller.md.sal.dom.broker.impl.legacy.sharded.adapter; -import static com.google.common.base.Preconditions.checkNotNull; +import static java.util.Objects.requireNonNull; import com.google.common.base.Optional; import com.google.common.util.concurrent.CheckedFuture; @@ -37,8 +37,8 @@ class ShardedDOMDataBrokerDelegatingReadTransaction implements DOMDataReadOnlyTr ShardedDOMDataBrokerDelegatingReadTransaction(final Object txIdentifier, final DOMDataTreeReadTransaction delegateTx) { - this.delegateTx = checkNotNull(delegateTx); - this.txIdentifier = checkNotNull(txIdentifier); + this.delegateTx = requireNonNull(delegateTx); + this.txIdentifier = requireNonNull(txIdentifier); } @Override diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingReadWriteTransaction.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingReadWriteTransaction.java index 48b56954ad..e2bf680014 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingReadWriteTransaction.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingReadWriteTransaction.java @@ -13,7 +13,6 @@ import static java.util.Objects.requireNonNull; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import com.google.common.util.concurrent.CheckedFuture; import com.google.common.util.concurrent.FluentFuture; import com.google.common.util.concurrent.FutureCallback; @@ -21,6 +20,8 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.SettableFuture; +import java.util.EnumMap; +import java.util.LinkedList; import java.util.Map; import java.util.Queue; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; @@ -70,7 +71,7 @@ class ShardedDOMDataBrokerDelegatingReadWriteTransaction implements DOMDataReadW this.readTxDelegate = requireNonNull(readTxDelegate); this.writeTxDelegate = requireNonNull(writeTxDelegate); this.txIdentifier = requireNonNull(readWriteTxId); - this.initialReadMap = Maps.newEnumMap(LogicalDatastoreType.class); + this.initialReadMap = new EnumMap<>(LogicalDatastoreType.class); final InMemoryDataTreeFactory treeFactory = new InMemoryDataTreeFactory(); final ImmutableMap.Builder snapshotMapBuilder = ImmutableMap.builder(); @@ -81,7 +82,7 @@ class ShardedDOMDataBrokerDelegatingReadWriteTransaction implements DOMDataReadW tree.setSchemaContext(ctx); snapshotMapBuilder.put(store, tree.takeSnapshot()); - modificationHistoryMapBuilder.put(store, Lists.newLinkedList()); + modificationHistoryMapBuilder.put(store, new LinkedList<>()); } modificationHistoryMap = modificationHistoryMapBuilder.build(); diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingTransactionChain.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingTransactionChain.java index 57e1116fa1..103fe394dd 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingTransactionChain.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingTransactionChain.java @@ -10,7 +10,7 @@ package org.opendaylight.controller.md.sal.dom.broker.impl.legacy.sharded.adapte import static java.util.Objects.requireNonNull; import com.google.common.base.Preconditions; -import com.google.common.collect.Maps; +import java.util.HashMap; import java.util.Map; import java.util.concurrent.atomic.AtomicLong; import org.opendaylight.controller.md.sal.common.api.data.AsyncTransaction; @@ -27,14 +27,13 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext; @Deprecated class ShardedDOMDataBrokerDelegatingTransactionChain implements DOMTransactionChain, DOMTransactionChainListener { + private final Map> transactionMap = new HashMap<>(); private final org.opendaylight.mdsal.dom.api.DOMTransactionChain txChainDelegate; private final SchemaContext schemaContext; private final TransactionChainListener txChainListener; private final Object txChainIdentifier; private final AtomicLong txNum = new AtomicLong(); - private final Map> transactionMap; - ShardedDOMDataBrokerDelegatingTransactionChain(final Object txChainIdentifier, final SchemaContext schemaContext, final org.opendaylight.mdsal.dom.api.DOMDataBroker @@ -45,7 +44,6 @@ class ShardedDOMDataBrokerDelegatingTransactionChain implements DOMTransactionCh this.txChainIdentifier = requireNonNull(txChainIdentifier); this.txChainListener = requireNonNull(txChainListener); this.txChainDelegate = brokerDelegate.createTransactionChain(this); - transactionMap = Maps.newHashMap(); } @Override @@ -93,13 +91,13 @@ class ShardedDOMDataBrokerDelegatingTransactionChain implements DOMTransactionCh } @Override - public void onTransactionChainFailed(org.opendaylight.mdsal.dom.api.DOMTransactionChain chain, - DOMDataTreeTransaction transaction, Throwable cause) { + public void onTransactionChainFailed(final org.opendaylight.mdsal.dom.api.DOMTransactionChain chain, + final DOMDataTreeTransaction transaction, final Throwable cause) { txChainListener.onTransactionChainFailed(this, transactionFromDelegate(transaction.getIdentifier()), cause); } @Override - public void onTransactionChainSuccessful(org.opendaylight.mdsal.dom.api.DOMTransactionChain chain) { + public void onTransactionChainSuccessful(final org.opendaylight.mdsal.dom.api.DOMTransactionChain chain) { txChainListener.onTransactionChainSuccessful(this); } diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingWriteTransaction.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingWriteTransaction.java index 32aa222ac4..25019ff3d5 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingWriteTransaction.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/legacy/sharded/adapter/ShardedDOMDataBrokerDelegatingWriteTransaction.java @@ -5,10 +5,9 @@ * 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.legacy.sharded.adapter; -import static com.google.common.base.Preconditions.checkNotNull; +import static java.util.Objects.requireNonNull; import com.google.common.util.concurrent.FluentFuture; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; @@ -24,9 +23,9 @@ class ShardedDOMDataBrokerDelegatingWriteTransaction implements DOMDataWriteTran private final Object txIdentifier; ShardedDOMDataBrokerDelegatingWriteTransaction(final Object txIdentifier, - final DOMDataTreeWriteTransaction delegateTx) { - this.delegateTx = checkNotNull(delegateTx); - this.txIdentifier = checkNotNull(txIdentifier); + final DOMDataTreeWriteTransaction delegateTx) { + this.delegateTx = requireNonNull(delegateTx); + this.txIdentifier = requireNonNull(txIdentifier); } @Override diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/broker/spi/rpc/RpcRoutingStrategy.java b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/broker/spi/rpc/RpcRoutingStrategy.java index 0f8d2a70e3..96bf5a8b64 100644 --- a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/broker/spi/rpc/RpcRoutingStrategy.java +++ b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/md/sal/dom/broker/spi/rpc/RpcRoutingStrategy.java @@ -7,8 +7,9 @@ */ package org.opendaylight.controller.md.sal.dom.broker.spi.rpc; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Optional; -import com.google.common.base.Preconditions; import org.opendaylight.yangtools.concepts.Identifiable; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; @@ -18,13 +19,13 @@ import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; @Deprecated public abstract class RpcRoutingStrategy implements Identifiable { - private static final QName CONTEXT_REFERENCE = QName.create("urn:opendaylight:yang:extension:yang-ext", "2013-07-09", "context-reference").intern(); + private final QName identifier; private RpcRoutingStrategy(final QName identifier) { - this.identifier = Preconditions.checkNotNull(identifier); + this.identifier = requireNonNull(identifier); } /** @@ -85,8 +86,8 @@ public abstract class RpcRoutingStrategy implements Identifiable { private RoutedRpcStrategy(final QName identifier, final QName ctx, final QName leaf) { super(identifier); - this.context = Preconditions.checkNotNull(ctx); - this.leaf = Preconditions.checkNotNull(leaf); + this.context = requireNonNull(ctx); + this.leaf = requireNonNull(leaf); } @Override diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/AbstractSnapshotBackedTransactionChain.java b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/AbstractSnapshotBackedTransactionChain.java index d967e93a7a..5a47b97520 100644 --- a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/AbstractSnapshotBackedTransactionChain.java +++ b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/AbstractSnapshotBackedTransactionChain.java @@ -7,8 +7,10 @@ */ package org.opendaylight.controller.sal.core.spi.data; +import static com.google.common.base.Preconditions.checkState; +import static java.util.Objects.requireNonNull; + import com.google.common.annotations.Beta; -import com.google.common.base.Preconditions; import java.util.AbstractMap.SimpleEntry; import java.util.Map.Entry; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; @@ -43,11 +45,11 @@ public abstract class AbstractSnapshotBackedTransactionChain extends Transact private final AbstractSnapshotBackedTransactionChain chain; Idle(final AbstractSnapshotBackedTransactionChain chain) { - this.chain = Preconditions.checkNotNull(chain); + this.chain = requireNonNull(chain); } @Override - protected DataTreeSnapshot getSnapshot(Object transactionId) { + protected DataTreeSnapshot getSnapshot(final Object transactionId) { return chain.takeSnapshot(); } } @@ -62,7 +64,7 @@ public abstract class AbstractSnapshotBackedTransactionChain extends Transact private volatile DataTreeSnapshot snapshot; Allocated(final DOMStoreWriteTransaction transaction) { - this.transaction = Preconditions.checkNotNull(transaction); + this.transaction = requireNonNull(transaction); } public DOMStoreWriteTransaction getTransaction() { @@ -70,9 +72,9 @@ public abstract class AbstractSnapshotBackedTransactionChain extends Transact } @Override - protected DataTreeSnapshot getSnapshot(Object transactionId) { + protected DataTreeSnapshot getSnapshot(final Object transactionId) { final DataTreeSnapshot ret = snapshot; - Preconditions.checkState(ret != null, + checkState(ret != null, "Could not get snapshot for transaction %s - previous transaction %s is not ready yet", transactionId, transaction.getIdentifier()); return ret; @@ -80,8 +82,7 @@ public abstract class AbstractSnapshotBackedTransactionChain extends Transact void setSnapshot(final DataTreeSnapshot snapshot) { final boolean success = SNAPSHOT_UPDATER.compareAndSet(this, null, snapshot); - Preconditions.checkState(success, "Transaction %s has already been marked as ready", - transaction.getIdentifier()); + checkState(success, "Transaction %s has already been marked as ready", transaction.getIdentifier()); } } @@ -92,11 +93,11 @@ public abstract class AbstractSnapshotBackedTransactionChain extends Transact private final String message; Shutdown(final String message) { - this.message = Preconditions.checkNotNull(message); + this.message = requireNonNull(message); } @Override - protected DataTreeSnapshot getSnapshot(Object transactionId) { + protected DataTreeSnapshot getSnapshot(final Object transactionId) { throw new IllegalStateException(message); } } @@ -115,7 +116,7 @@ public abstract class AbstractSnapshotBackedTransactionChain extends Transact state = idleState; } - private Entry getSnapshot(T transactionId) { + private Entry getSnapshot(final T transactionId) { final State localState = state; return new SimpleEntry<>(localState, localState.getSnapshot(transactionId)); } @@ -130,7 +131,7 @@ public abstract class AbstractSnapshotBackedTransactionChain extends Transact return newReadOnlyTransaction(nextTransactionIdentifier()); } - protected DOMStoreReadTransaction newReadOnlyTransaction(T transactionId) { + protected DOMStoreReadTransaction newReadOnlyTransaction(final T transactionId) { final Entry entry = getSnapshot(transactionId); return SnapshotBackedTransactions.newReadTransaction(transactionId, getDebugTransactions(), entry.getValue(), this); @@ -146,7 +147,7 @@ public abstract class AbstractSnapshotBackedTransactionChain extends Transact return newReadWriteTransaction(nextTransactionIdentifier()); } - protected DOMStoreReadWriteTransaction newReadWriteTransaction(T transactionId) { + protected DOMStoreReadWriteTransaction newReadWriteTransaction(final T transactionId) { Entry entry; DOMStoreReadWriteTransaction ret; @@ -164,7 +165,7 @@ public abstract class AbstractSnapshotBackedTransactionChain extends Transact return newWriteOnlyTransaction(nextTransactionIdentifier()); } - protected DOMStoreWriteTransaction newWriteOnlyTransaction(T transactionId) { + protected DOMStoreWriteTransaction newWriteOnlyTransaction(final T transactionId) { Entry entry; DOMStoreWriteTransaction ret; @@ -203,8 +204,8 @@ public abstract class AbstractSnapshotBackedTransactionChain extends Transact if (localState instanceof Allocated) { final Allocated allocated = (Allocated)localState; final DOMStoreWriteTransaction transaction = allocated.getTransaction(); - Preconditions.checkState(tx.equals(transaction), "Mis-ordered ready transaction %s last allocated was %s", - tx, transaction); + checkState(tx.equals(transaction), "Mis-ordered ready transaction %s last allocated was %s", tx, + transaction); allocated.setSnapshot(tree); } else { LOG.debug("Ignoring transaction {} readiness due to state {}", tx, localState); @@ -218,8 +219,7 @@ public abstract class AbstractSnapshotBackedTransactionChain extends Transact final State localState = state; do { - Preconditions.checkState(!CLOSED.equals(localState), "Transaction chain %s has been closed", this); - + checkState(!CLOSED.equals(localState), "Transaction chain %s has been closed", this); if (FAILED.equals(localState)) { LOG.debug("Ignoring user close in failed state"); return; diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedReadTransaction.java b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedReadTransaction.java index be5cbead3a..b36211da8f 100644 --- a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedReadTransaction.java +++ b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedReadTransaction.java @@ -7,11 +7,10 @@ */ package org.opendaylight.controller.sal.core.spi.data; -import static com.google.common.base.Preconditions.checkNotNull; +import static java.util.Objects.requireNonNull; import com.google.common.annotations.Beta; import com.google.common.base.Optional; -import com.google.common.base.Preconditions; import com.google.common.util.concurrent.CheckedFuture; import com.google.common.util.concurrent.Futures; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; @@ -58,7 +57,7 @@ public final class SnapshotBackedReadTransaction extends AbstractDOMStoreTran SnapshotBackedReadTransaction(final T identifier, final boolean debug, final DataTreeSnapshot snapshot, final TransactionClosePrototype closeImpl) { super(identifier, debug); - this.stableSnapshot = Preconditions.checkNotNull(snapshot); + this.stableSnapshot = requireNonNull(snapshot); this.closeImpl = closeImpl; LOG.debug("ReadOnly Tx: {} allocated with snapshot {}", identifier, snapshot); } @@ -82,7 +81,7 @@ public final class SnapshotBackedReadTransaction extends AbstractDOMStoreTran @SuppressWarnings("checkstyle:IllegalCatch") public CheckedFuture>, ReadFailedException> read(final YangInstanceIdentifier path) { LOG.debug("Tx: {} Read: {}", getIdentifier(), path); - checkNotNull(path, "Path must not be null."); + requireNonNull(path, "Path must not be null."); final DataTreeSnapshot snapshot = stableSnapshot; if (snapshot == null) { @@ -100,7 +99,7 @@ public final class SnapshotBackedReadTransaction extends AbstractDOMStoreTran @Override public CheckedFuture exists(final YangInstanceIdentifier path) { LOG.debug("Tx: {} Exists: {}", getIdentifier(), path); - checkNotNull(path, "Path must not be null."); + requireNonNull(path, "Path must not be null."); try { return Futures.immediateCheckedFuture(read(path).checkedGet().isPresent()); diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedReadWriteTransaction.java b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedReadWriteTransaction.java index 435261435f..4b87548c3e 100644 --- a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedReadWriteTransaction.java +++ b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedReadWriteTransaction.java @@ -7,7 +7,7 @@ */ package org.opendaylight.controller.sal.core.spi.data; -import static com.google.common.base.Preconditions.checkNotNull; +import static java.util.Objects.requireNonNull; import com.google.common.annotations.Beta; import com.google.common.base.Optional; @@ -42,7 +42,7 @@ public final class SnapshotBackedReadWriteTransaction extends SnapshotBackedW @SuppressWarnings("checkstyle:IllegalCatch") public CheckedFuture>, ReadFailedException> read(final YangInstanceIdentifier path) { LOG.debug("Tx: {} Read: {}", getIdentifier(), path); - checkNotNull(path, "Path must not be null."); + requireNonNull(path, "Path must not be null."); final Optional> result; try { diff --git a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedWriteTransaction.java b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedWriteTransaction.java index fe3d219272..ee48bf6a44 100644 --- a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedWriteTransaction.java +++ b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/SnapshotBackedWriteTransaction.java @@ -8,11 +8,11 @@ package org.opendaylight.controller.sal.core.spi.data; import static com.google.common.base.Preconditions.checkState; +import static java.util.Objects.requireNonNull; import com.google.common.annotations.Beta; import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Optional; -import com.google.common.base.Preconditions; import com.google.common.base.Throwables; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; import org.eclipse.jdt.annotation.Nullable; @@ -53,7 +53,7 @@ public class SnapshotBackedWriteTransaction extends AbstractDOMStoreTransacti SnapshotBackedWriteTransaction(final T identifier, final boolean debug, final DataTreeSnapshot snapshot, final TransactionReadyPrototype readyImpl) { super(identifier, debug); - this.readyImpl = Preconditions.checkNotNull(readyImpl, "readyImpl must not be null."); + this.readyImpl = requireNonNull(readyImpl, "readyImpl must not be null."); mutableTree = snapshot.newModification(); LOG.debug("Write Tx: {} allocated with snapshot {}", identifier, snapshot); } diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/ActionRegistry.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/ActionRegistry.java index 73a471c5b2..33c5c35f04 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/ActionRegistry.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/ActionRegistry.java @@ -7,11 +7,12 @@ */ package org.opendaylight.controller.remote.rpc.registry; +import static java.util.Objects.requireNonNull; + import akka.actor.ActorRef; import akka.actor.Address; import akka.actor.Props; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -41,7 +42,7 @@ public class ActionRegistry extends BucketStoreActor { public ActionRegistry(final RemoteOpsProviderConfig config, final ActorRef rpcInvoker, final ActorRef rpcRegistrar) { super(config, config.getRpcRegistryPersistenceId(), new ActionRoutingTable(rpcInvoker, ImmutableSet.of())); - this.rpcRegistrar = Preconditions.checkNotNull(rpcRegistrar); + this.rpcRegistrar = requireNonNull(rpcRegistrar); this.mxBean = new RemoteActionRegistryMXBeanImpl(new BucketStoreAccess(self(), getContext().dispatcher(), config.getAskDuration()), config.getAskDuration()); } @@ -111,7 +112,7 @@ public class ActionRegistry extends BucketStoreActor { @VisibleForTesting public RemoteActionEndpoint(final ActorRef router, final Collection actions) { - this.router = Preconditions.checkNotNull(router); + this.router = requireNonNull(router); this.actions = ImmutableSet.copyOf(actions); } diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/RpcRegistry.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/RpcRegistry.java index 68fead4407..bcb3199071 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/RpcRegistry.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/RpcRegistry.java @@ -7,11 +7,13 @@ */ package org.opendaylight.controller.remote.rpc.registry; +import static com.google.common.base.Preconditions.checkArgument; +import static java.util.Objects.requireNonNull; + import akka.actor.ActorRef; import akka.actor.Address; import akka.actor.Props; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -44,7 +46,7 @@ public class RpcRegistry extends BucketStoreActor { public RpcRegistry(final RemoteOpsProviderConfig config, final ActorRef rpcInvoker, final ActorRef rpcRegistrar) { super(config, config.getRpcRegistryPersistenceId(), new RoutingTable(rpcInvoker, ImmutableSet.of())); - this.rpcRegistrar = Preconditions.checkNotNull(rpcRegistrar); + this.rpcRegistrar = requireNonNull(rpcRegistrar); this.mxBean = new RemoteRpcRegistryMXBeanImpl(new BucketStoreAccess(self(), getContext().dispatcher(), config.getAskDuration()), config.getAskDuration()); } @@ -123,7 +125,7 @@ public class RpcRegistry extends BucketStoreActor { @VisibleForTesting public RemoteRpcEndpoint(final ActorRef router, final Collection rpcs) { - this.router = Preconditions.checkNotNull(router); + this.router = requireNonNull(router); this.rpcs = ImmutableSet.copyOf(rpcs); } @@ -144,7 +146,7 @@ public class RpcRegistry extends BucketStoreActor { final List rpcRouteIdentifiers; AbstractRouteMessage(final Collection rpcRouteIdentifiers) { - Preconditions.checkArgument(rpcRouteIdentifiers != null && !rpcRouteIdentifiers.isEmpty(), + checkArgument(rpcRouteIdentifiers != null && !rpcRouteIdentifiers.isEmpty(), "Route Identifiers must be supplied"); this.rpcRouteIdentifiers = ImmutableList.copyOf(rpcRouteIdentifiers); } diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/BucketStoreActor.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/BucketStoreActor.java index 6c5ca77b03..b494256d50 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/BucketStoreActor.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/BucketStoreActor.java @@ -5,9 +5,11 @@ * 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.remote.rpc.registry.gossip; +import static com.google.common.base.Preconditions.checkState; +import static com.google.common.base.Verify.verify; +import static java.util.Objects.requireNonNull; import static org.opendaylight.controller.remote.rpc.registry.gossip.BucketStoreAccess.Singletons.GET_ALL_BUCKETS; import static org.opendaylight.controller.remote.rpc.registry.gossip.BucketStoreAccess.Singletons.GET_BUCKET_VERSIONS; @@ -25,8 +27,6 @@ import akka.persistence.SaveSnapshotSuccess; import akka.persistence.SnapshotOffer; import akka.persistence.SnapshotSelectionCriteria; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Preconditions; -import com.google.common.base.Verify; import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableMap; import com.google.common.collect.SetMultimap; @@ -89,9 +89,9 @@ public abstract class BucketStoreActor> extends private boolean persisting; protected BucketStoreActor(final RemoteOpsProviderConfig config, final String persistenceId, final T initialData) { - this.config = Preconditions.checkNotNull(config); - this.initialData = Preconditions.checkNotNull(initialData); - this.persistenceId = Preconditions.checkNotNull(persistenceId); + this.config = requireNonNull(config); + this.initialData = requireNonNull(initialData); + this.persistenceId = requireNonNull(persistenceId); } static ExecuteInActor getBucketsByMembersMessage(final Collection
members) { @@ -224,7 +224,7 @@ public abstract class BucketStoreActor> extends if (bumpIncarnation) { LOG.debug("Version wrapped. incrementing incarnation"); - Verify.verify(incarnation < Integer.MAX_VALUE, "Ran out of incarnations, cannot continue"); + verify(incarnation < Integer.MAX_VALUE, "Ran out of incarnations, cannot continue"); incarnation = incarnation + 1; persisting = true; @@ -389,7 +389,7 @@ public abstract class BucketStoreActor> extends } private LocalBucket getLocalBucket() { - Preconditions.checkState(localBucket != null, "Attempted to access local bucket before recovery completed"); + checkState(localBucket != null, "Attempted to access local bucket before recovery completed"); return localBucket; } } diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/GossipEnvelope.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/GossipEnvelope.java index a6a0c2b6f7..950b5f9f08 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/GossipEnvelope.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/GossipEnvelope.java @@ -7,8 +7,9 @@ */ package org.opendaylight.controller.remote.rpc.registry.gossip; +import static java.util.Objects.requireNonNull; + import akka.actor.Address; -import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import java.io.Serializable; import java.util.Map; @@ -21,7 +22,7 @@ final class GossipEnvelope implements Serializable { private final Address to; GossipEnvelope(final Address from, final Address to, final Map> buckets) { - this.to = Preconditions.checkNotNull(to); + this.to = requireNonNull(to); this.buckets = ImmutableMap.copyOf(buckets); this.from = from; } diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/Gossiper.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/Gossiper.java index e75bef24c7..f43a1d9f96 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/Gossiper.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/Gossiper.java @@ -7,6 +7,9 @@ */ package org.opendaylight.controller.remote.rpc.registry.gossip; +import static com.google.common.base.Verify.verifyNotNull; +import static java.util.Objects.requireNonNull; + import akka.actor.ActorRef; import akka.actor.ActorRefProvider; import akka.actor.ActorSelection; @@ -18,8 +21,6 @@ import akka.cluster.ClusterActorRefProvider; import akka.cluster.ClusterEvent; import akka.cluster.Member; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Preconditions; -import com.google.common.base.Verify; import com.google.common.collect.Maps; import java.util.ArrayList; import java.util.HashMap; @@ -85,7 +86,7 @@ public class Gossiper extends AbstractUntypedActorWithMetering { private BucketStoreAccess bucketStore; Gossiper(final RemoteOpsProviderConfig config, final Boolean autoStartGossipTicks) { - this.config = Preconditions.checkNotNull(config); + this.config = requireNonNull(config); this.autoStartGossipTicks = autoStartGossipTicks.booleanValue(); } @@ -243,7 +244,7 @@ public class Gossiper extends AbstractUntypedActorWithMetering { } LOG.trace("Gossiping to [{}]", address); - getLocalStatusAndSendTo(Verify.verifyNotNull(peers.get(address))); + getLocalStatusAndSendTo(verifyNotNull(peers.get(address))); } /** diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/LocalBucket.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/LocalBucket.java index 5e9d907aad..313dac8089 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/LocalBucket.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/registry/gossip/LocalBucket.java @@ -7,7 +7,8 @@ */ package org.opendaylight.controller.remote.rpc.registry.gossip; -import com.google.common.base.Preconditions; +import static com.google.common.base.Preconditions.checkArgument; +import static java.util.Objects.requireNonNull; /** * Local bucket implementation. Unlike a full-blown {@link Bucket}, this class is mutable and tracks when it has been @@ -30,9 +31,9 @@ final class LocalBucket> { private boolean bumpVersion; LocalBucket(final int incarnation, final T data) { - Preconditions.checkArgument(incarnation >= 0); - this.version = ((long)incarnation) << Integer.SIZE; - this.data = Preconditions.checkNotNull(data); + checkArgument(incarnation >= 0); + this.version = (long)incarnation << Integer.SIZE; + this.data = requireNonNull(data); } T getData() { @@ -49,7 +50,7 @@ final class LocalBucket> { } boolean setData(final T newData) { - this.data = Preconditions.checkNotNull(newData); + this.data = requireNonNull(newData); if (!bumpVersion) { return false; } diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/mbeans/RemoteRpcRegistryMXBeanImplTest.java b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/mbeans/RemoteRpcRegistryMXBeanImplTest.java index dbeccb2456..5ea18d2cb6 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/mbeans/RemoteRpcRegistryMXBeanImplTest.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/registry/mbeans/RemoteRpcRegistryMXBeanImplTest.java @@ -7,6 +7,10 @@ */ package org.opendaylight.controller.remote.rpc.registry.mbeans; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + import akka.actor.ActorRef; import akka.actor.ActorSystem; import akka.actor.Props; @@ -21,7 +25,6 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; import org.junit.After; -import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.opendaylight.controller.remote.rpc.RemoteOpsProviderConfig; @@ -76,8 +79,8 @@ public class RemoteRpcRegistryMXBeanImplTest { public void testGetGlobalRpcEmptyBuckets() { final Set globalRpc = mxBean.getGlobalRpc(); - Assert.assertNotNull(globalRpc); - Assert.assertTrue(globalRpc.isEmpty()); + assertNotNull(globalRpc); + assertTrue(globalRpc.isEmpty()); } @Test @@ -85,19 +88,19 @@ public class RemoteRpcRegistryMXBeanImplTest { testActor.tell(new RpcRegistry.Messages.AddOrUpdateRoutes(Lists.newArrayList(buckets)), ActorRef.noSender()); final Set globalRpc = mxBean.getGlobalRpc(); - Assert.assertNotNull(globalRpc); - Assert.assertEquals(1, globalRpc.size()); + assertNotNull(globalRpc); + assertEquals(1, globalRpc.size()); final String rpc = globalRpc.iterator().next(); - Assert.assertEquals(EMPTY_SCHEMA_PATH.toString(), rpc); + assertEquals(EMPTY_SCHEMA_PATH.toString(), rpc); } @Test public void testGetLocalRegisteredRoutedRpcEmptyBuckets() { final Set localRegisteredRoutedRpc = mxBean.getLocalRegisteredRoutedRpc(); - Assert.assertNotNull(localRegisteredRoutedRpc); - Assert.assertTrue(localRegisteredRoutedRpc.isEmpty()); + assertNotNull(localRegisteredRoutedRpc); + assertTrue(localRegisteredRoutedRpc.isEmpty()); } @Test @@ -105,20 +108,20 @@ public class RemoteRpcRegistryMXBeanImplTest { testActor.tell(new RpcRegistry.Messages.AddOrUpdateRoutes(Lists.newArrayList(buckets)), ActorRef.noSender()); final Set localRegisteredRoutedRpc = mxBean.getLocalRegisteredRoutedRpc(); - Assert.assertNotNull(localRegisteredRoutedRpc); - Assert.assertEquals(1, localRegisteredRoutedRpc.size()); + assertNotNull(localRegisteredRoutedRpc); + assertEquals(1, localRegisteredRoutedRpc.size()); final String localRpc = localRegisteredRoutedRpc.iterator().next(); - Assert.assertTrue(localRpc.contains(LOCAL_QNAME.toString())); - Assert.assertTrue(localRpc.contains(LOCAL_SCHEMA_PATH.toString())); + assertTrue(localRpc.contains(LOCAL_QNAME.toString())); + assertTrue(localRpc.contains(LOCAL_SCHEMA_PATH.toString())); } @Test public void testFindRpcByNameEmptyBuckets() { final Map rpcByName = mxBean.findRpcByName(""); - Assert.assertNotNull(rpcByName); - Assert.assertTrue(rpcByName.isEmpty()); + assertNotNull(rpcByName); + assertTrue(rpcByName.isEmpty()); } @Test @@ -126,17 +129,17 @@ public class RemoteRpcRegistryMXBeanImplTest { testActor.tell(new RpcRegistry.Messages.AddOrUpdateRoutes(Lists.newArrayList(buckets)), ActorRef.noSender()); final Map rpcByName = mxBean.findRpcByName(""); - Assert.assertNotNull(rpcByName); - Assert.assertEquals(1, rpcByName.size()); - Assert.assertTrue(rpcByName.containsValue(LOCAL_QNAME.getLocalName())); + assertNotNull(rpcByName); + assertEquals(1, rpcByName.size()); + assertTrue(rpcByName.containsValue(LOCAL_QNAME.getLocalName())); } @Test public void testFindRpcByRouteEmptyBuckets() { final Map rpcByRoute = mxBean.findRpcByRoute(""); - Assert.assertNotNull(rpcByRoute); - Assert.assertTrue(rpcByRoute.isEmpty()); + assertNotNull(rpcByRoute); + assertTrue(rpcByRoute.isEmpty()); } @Test @@ -144,15 +147,15 @@ public class RemoteRpcRegistryMXBeanImplTest { testActor.tell(new RpcRegistry.Messages.AddOrUpdateRoutes(Lists.newArrayList(buckets)), ActorRef.noSender()); final Map rpcByRoute = mxBean.findRpcByRoute(""); - Assert.assertNotNull(rpcByRoute); - Assert.assertEquals(1, rpcByRoute.size()); - Assert.assertTrue(rpcByRoute.containsValue(LOCAL_QNAME.getLocalName())); + assertNotNull(rpcByRoute); + assertEquals(1, rpcByRoute.size()); + assertTrue(rpcByRoute.containsValue(LOCAL_QNAME.getLocalName())); } @Test public void testGetBucketVersionsEmptyBuckets() { final String bucketVersions = mxBean.getBucketVersions(); - Assert.assertEquals(Collections.EMPTY_MAP.toString(), bucketVersions); + assertEquals(Collections.emptyMap().toString(), bucketVersions); } @Test @@ -160,6 +163,6 @@ public class RemoteRpcRegistryMXBeanImplTest { testActor.tell(new RpcRegistry.Messages.AddOrUpdateRoutes(Lists.newArrayList(buckets)), ActorRef.noSender()); final String bucketVersions = mxBean.getBucketVersions(); - Assert.assertTrue(bucketVersions.contains(testActor.provider().getDefaultAddress().toString())); + assertTrue(bucketVersions.contains(testActor.provider().getDefaultAddress().toString())); } } diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/ProduceTransactionsHandler.java b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/ProduceTransactionsHandler.java index c883fe0b58..232391209b 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/ProduceTransactionsHandler.java +++ b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/ProduceTransactionsHandler.java @@ -5,10 +5,10 @@ * 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.clustering.it.provider.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import com.google.common.util.concurrent.FluentFuture; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; @@ -58,8 +58,8 @@ public final class ProduceTransactionsHandler extends AbstractTransactionHandler private ProduceTransactionsHandler(final DOMDataTreeProducer producer, final DOMDataTreeIdentifier idListItem, final ProduceTransactionsInput input) { super(input); - this.itemProducer = Preconditions.checkNotNull(producer); - this.idListItem = Preconditions.checkNotNull(idListItem); + this.itemProducer = requireNonNull(producer); + this.idListItem = requireNonNull(idListItem); } public static ListenableFuture> start( diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/PublishNotificationsTask.java b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/PublishNotificationsTask.java index bd755d40c8..4f4b7f8e10 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/PublishNotificationsTask.java +++ b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/PublishNotificationsTask.java @@ -5,10 +5,11 @@ * 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.clustering.it.provider.impl; -import com.google.common.base.Preconditions; +import static com.google.common.base.Preconditions.checkArgument; +import static java.util.Objects.requireNonNull; + import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; @@ -39,14 +40,12 @@ public class PublishNotificationsTask implements Runnable { public PublishNotificationsTask(final NotificationPublishService notificationPublishService, final String notificationId, final long secondsToTake, final long maxPerSecond) { - Preconditions.checkNotNull(notificationPublishService); - Preconditions.checkNotNull(notificationId); - Preconditions.checkArgument(secondsToTake > 0); - Preconditions.checkArgument(maxPerSecond > 0); - this.notificationPublishService = notificationPublishService; - this.notificationId = notificationId; + this.notificationPublishService = requireNonNull(notificationPublishService); + this.notificationId = requireNonNull(notificationId); + checkArgument(secondsToTake > 0); this.timeToTake = secondsToTake * SECOND_AS_NANO; + checkArgument(maxPerSecond > 0); this.delay = SECOND_AS_NANO / maxPerSecond; LOG.debug("Delay : {}", delay); @@ -76,7 +75,7 @@ public class PublishNotificationsTask implements Runnable { LOG.debug("current {}, starttime: {}, timetotake: {}, current-start = {}", current, startTime, timeToTake, current - startTime); - if ((current - startTime) > timeToTake) { + if (current - startTime > timeToTake) { LOG.debug("Sequence number: {}", sequenceNumber); scheduledFuture.cancel(false); executor.shutdown(); diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/WriteTransactionsHandler.java b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/WriteTransactionsHandler.java index 70b920dc8d..b0503b2406 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/WriteTransactionsHandler.java +++ b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/WriteTransactionsHandler.java @@ -5,10 +5,10 @@ * 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.clustering.it.provider.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; import java.util.LinkedHashSet; @@ -88,7 +88,7 @@ public abstract class WriteTransactionsHandler extends AbstractTransactionHandle Simple(final DOMDataBroker dataBroker, final YangInstanceIdentifier idListItem, final WriteTransactionsInput input) { super(idListItem, input); - this.dataBroker = Preconditions.checkNotNull(dataBroker); + this.dataBroker = requireNonNull(dataBroker); } @Override @@ -123,7 +123,7 @@ public abstract class WriteTransactionsHandler extends AbstractTransactionHandle WriteTransactionsHandler(final YangInstanceIdentifier idListItem, final WriteTransactionsInput input) { super(input); - this.idListItem = Preconditions.checkNotNull(idListItem); + this.idListItem = requireNonNull(idListItem); } public static ListenableFuture> start(final DOMDataBroker domDataBroker, diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/YnlListener.java b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/YnlListener.java index c6744a9393..331ee91850 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/YnlListener.java +++ b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/YnlListener.java @@ -5,10 +5,10 @@ * 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.clustering.it.provider.impl; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import java.util.concurrent.atomic.AtomicLong; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.UnsubscribeYnlOutput; import org.opendaylight.yang.gen.v1.tag.opendaylight.org._2017.controller.yang.lowlevel.control.rev170215.UnsubscribeYnlOutputBuilder; @@ -18,7 +18,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class YnlListener implements OdlMdsalLowlevelTargetListener { - private static final Logger LOG = LoggerFactory.getLogger(YnlListener.class); private final String id; @@ -29,8 +28,7 @@ public class YnlListener implements OdlMdsalLowlevelTargetListener { private final AtomicLong errNot = new AtomicLong(); public YnlListener(final String id) { - Preconditions.checkNotNull(id); - this.id = id; + this.id = requireNonNull(id); } @Override diff --git a/opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java b/opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java index fc1e380a4c..4b425d121a 100644 --- a/opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java +++ b/opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java @@ -7,6 +7,7 @@ */ package org.opendaylight.controller.sample.toaster.provider; +import static java.util.Objects.requireNonNull; import static org.opendaylight.mdsal.binding.api.DataObjectModification.ModificationType.DELETE; import static org.opendaylight.mdsal.binding.api.DataObjectModification.ModificationType.WRITE; import static org.opendaylight.mdsal.common.api.LogicalDatastoreType.CONFIGURATION; @@ -14,7 +15,6 @@ import static org.opendaylight.mdsal.common.api.LogicalDatastoreType.OPERATIONAL import static org.opendaylight.yangtools.yang.common.RpcError.ErrorType.APPLICATION; import com.google.common.base.Function; -import com.google.common.base.Preconditions; import com.google.common.util.concurrent.FluentFuture; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; @@ -120,9 +120,8 @@ public class OpendaylightToaster extends AbstractMXBean public void init() { LOG.info("Initializing..."); - Preconditions.checkNotNull(dataBroker, "dataBroker must be set"); - dataTreeChangeListenerRegistration = dataBroker.registerDataTreeChangeListener( - DataTreeIdentifier.create(CONFIGURATION, TOASTER_IID), this); + dataTreeChangeListenerRegistration = requireNonNull(dataBroker, "dataBroker must be set") + .registerDataTreeChangeListener(DataTreeIdentifier.create(CONFIGURATION, TOASTER_IID), this); setToasterStatusUp(null); // Register our MXBean.