Switch to Objects.requireNonNull 79/80279/1
authorStephen Kitt <skitt@redhat.com>
Tue, 12 Feb 2019 11:04:48 +0000 (12:04 +0100)
committerStephen Kitt <skitt@redhat.com>
Tue, 12 Feb 2019 11:05:53 +0000 (12:05 +0100)
... instead of Guava’s Preconditions.checkNotNull.

Change-Id: If7979ac0071e8c1d1af2d7913c6df791942825ab
Signed-off-by: Stephen Kitt <skitt@redhat.com>
124 files changed:
binding/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/maven/api/gen/plugin/CodeGeneratorImpl.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeListenerAdapter.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDataTreeChangeListenerRegistration.java
binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/invoke/LocalNameRpcServiceInvoker.java
binding/mdsal-binding-dom-codec-osgi/src/main/java/org/opendaylight/mdsal/binding/dom/codec/osgi/impl/ModuleInfoBundleTracker.java
binding/mdsal-binding-dom-codec-osgi/src/main/java/org/opendaylight/mdsal/binding/dom/codec/osgi/impl/OsgiModuleInfoRegistry.java
binding/mdsal-binding-dom-codec-osgi/src/main/java/org/opendaylight/mdsal/binding/dom/codec/osgi/impl/SimpleBindingRuntimeContextService.java
binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/gen/impl/DataNodeContainerSerializerSource.java
binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/gen/impl/DataObjectSerializerSource.java
binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/gen/spi/StaticConstantDefinition.java
binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/BindingNormalizedNodeCache.java
binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/BindingToNormalizedStreamWriter.java
binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/EncapsulatedValueCodec.java
binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/IdentityCodec.java
binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/InstanceIdentifierCodec.java
binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/MissingSchemaForClassException.java
binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ReflectionBasedCodec.java
binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/SchemaRootCodecContext.java
binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/UnionValueOptionContext.java
binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/util/ChoiceDispatchSerializer.java
binding/mdsal-binding-dom-codec/src/test/java/org/opendaylight/mdsal/binding/dom/codec/test/AugmentationClassDiscoveredAfterCodecTest.java
binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/generator/util/YangSchemaUtils.java
binding/mdsal-binding-generator-impl/src/main/java/org/opendaylight/mdsal/binding/yang/types/AbstractTypeProvider.java
binding/mdsal-binding-generator-impl/src/test/java/org/opendaylight/mdsal/binding/generator/impl/AbstractTypesTest.java
binding/mdsal-binding-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/java/api/generator/GeneratorJavaFile.java
binding/mdsal-binding-spec-util/src/main/java/org/opendaylight/mdsal/binding/spec/reflect/StringValueObjectFactory.java
binding/mdsal-binding-test-utils/src/main/java/org/opendaylight/mdsal/binding/testutils/DataBrokerFailuresImpl.java
binding2/mdsal-binding2-api/src/main/java/org/opendaylight/mdsal/binding/javav2/api/DataTreeIdentifier.java
binding2/mdsal-binding2-api/src/main/java/org/opendaylight/mdsal/binding/javav2/api/DataTreeListeningException.java
binding2/mdsal-binding2-api/src/main/java/org/opendaylight/mdsal/binding/javav2/api/DataTreeProducerBusyException.java
binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/data/tree/BindingDOMDataTreeCommitCohortAdapter.java
binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/data/tree/BindingDOMDataTreeCommitCohortRegistryAdapter.java
binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/data/tree/BindingDOMDataTreeListenerAdapter.java
binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/data/tree/BindingDOMDataTreeProducerAdapter.java
binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/data/tree/BindingDOMDataTreeServiceAdapter.java
binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/notification/NotificationListenerInvoker.java
binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/impl/operation/RpcServiceAdapter.java
binding2/mdsal-binding2-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/adapter/registration/BindingDataTreeListenerRegistration.java
binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/generator/impl/StaticBindingProperty.java
binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/generator/spi/generator/AbstractStreamWriterGenerator.java
binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/generator/spi/source/AbstractAugmentSerializerSource.java
binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/generator/spi/source/AbstractDataNodeContainerSerializerSource.java
binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/generator/spi/source/AbstractTreeNodeSerializerSource.java
binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/AnyxmlCodec.java
binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/BindingNormalizedNodeCodecRegistry.java
binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/BindingToNormalizedNodeCodec.java
binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/IdentityCodec.java
binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/InstanceIdentifierCodec.java
binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/cache/AbstractBindingNormalizedNodeCacheHolder.java
binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/cache/BindingNormalizedNodeCache.java
binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/cache/CachingNormalizedNodeCodec.java
binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/context/SchemaRootCodecContext.java
binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/context/UnionValueOptionContext.java
binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/context/base/AnyxmlNodeCodecContext.java
binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/context/base/BindingCodecContext.java
binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/context/base/DataContainerCodecPrototype.java
binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/context/base/LazyTreeNode.java
binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/context/base/LeafNodeCodecContext.java
binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/context/base/MissingSchemaForClassException.java
binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/serializer/BindingToNormalizedStreamWriter.java
binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/serializer/ChoiceDispatchSerializer.java
binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/value/BitsCodec.java
binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/value/EncapsulatedValueCodec.java
binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/value/ReflectionBasedCodec.java
binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/modification/LazyDataTreeModification.java
binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/modification/LazyTreeNodeModification.java
binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/AugmentToGenType.java
binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/BindingGeneratorImpl.java
binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/GenHelperUtil.java
binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/impl/RpcActionGenHelper.java
binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/yang/types/TypeGenHelper.java
binding2/mdsal-binding2-generator-impl/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/yang/types/TypeProviderImpl.java
binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/AbstractBaseType.java
binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/Types.java
binding2/mdsal-binding2-generator-util/src/main/java/org/opendaylight/mdsal/binding/javav2/generator/util/generated/type/builder/AbstractGeneratedTypeBuilder.java
binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/GeneratorJavaFile.java
binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/range_generators/AbstractPrimitiveRangeGenerator.java
binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/range_generators/AbstractRangeGenerator.java
binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/BaseRenderer.java
binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/ClassRenderer.java
binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/InterfaceRenderer.java
binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/renderers/UnionRenderer.java
binding2/mdsal-binding2-java-api-generator/src/main/java/org/opendaylight/mdsal/binding/javav2/java/api/generator/util/TextTemplateUtil.java
binding2/mdsal-binding2-maven-api-gen-plugin/src/main/java/org/opendaylight/mdsal/binding/javav2/maven/api/gen/plugin/CodeGeneratorImpl.java
binding2/mdsal-binding2-runtime/src/main/java/org/opendaylight/mdsal/binding/javav2/runtime/context/BindingRuntimeContext.java
binding2/mdsal-binding2-runtime/src/main/java/org/opendaylight/mdsal/binding/javav2/runtime/javassist/JavassistUtils.java
binding2/mdsal-binding2-runtime/src/main/java/org/opendaylight/mdsal/binding/javav2/runtime/reflection/AugmentationFieldGetter.java
binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding/javav2/spec/base/IdentifiableItem.java
binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding/javav2/spec/base/InstanceIdentifier.java
binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding/javav2/spec/base/Item.java
binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding/javav2/spec/runtime/BindingNamespaceType.java
binding2/mdsal-binding2-util/src/main/java/org/opendaylight/mdsal/binding/javav2/util/StringValueObjectFactory.java
dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/AbstractDOMRoutingTable.java
dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/AbstractDOMRoutingTableEntry.java
dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/AbstractDOMRpcRoutingTableEntry.java
dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/CommitCoordinationTask.java
dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMDataBrokerTransactionChainImpl.java
dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMDataTreeShardRegistration.java
dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/DOMNotificationRouterEvent.java
dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/SerializedDOMDataBroker.java
dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataTreeProducer.java
dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/ShardedDOMDataTreeWriteTransaction.java
dom/mdsal-dom-broker/src/main/java/org/opendaylight/mdsal/dom/broker/TransactionChainWriteTransaction.java
dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/ChainedTransactionCommitImpl.java
dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/DOMStoreTransactionChainImpl.java
dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/DataTreeModificationCursorAdaptor.java
dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/ForeignShardThreePhaseCommitCohort.java
dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/InMemoryDOMDataTreeShardThreePhaseCommitCohort.java
dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/InMemoryDOMStoreThreePhaseCommitCohort.java
dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/InMemoryShardDataModificationCursor.java
dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/InMemoryShardDataModificationFactory.java
dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/InmemoryDOMDataTreeShardWriteTransaction.java
dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/ShardCanCommitCoordinationTask.java
dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/ShardCommitCoordinationTask.java
dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/ShardDataModification.java
dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/ShardDataModificationFactoryBuilder.java
dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/ShardRootModificationContext.java
dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/ShardSubmitCoordinationTask.java
entityownership/mdsal-eos-binding-adapter/src/main/java/org/opendaylight/mdsal/eos/binding/dom/adapter/BindingEntityOwnershipCandidateRegistration.java
entityownership/mdsal-eos-binding-adapter/src/main/java/org/opendaylight/mdsal/eos/binding/dom/adapter/BindingEntityOwnershipListenerRegistration.java
entityownership/mdsal-eos-binding-api/src/main/java/org/opendaylight/mdsal/eos/binding/api/Entity.java
entityownership/mdsal-eos-dom-api/src/main/java/org/opendaylight/mdsal/eos/dom/api/DOMEntity.java
entityownership/mdsal-eos-dom-simple/src/main/java/org/opendaylight/mdsal/eos/dom/simple/SimpleDOMEntityOwnershipService.java
model/ietf/ietf-type-util/src/test/java/org/opendaylight/mdsal/model/ietf/util/IpClass.java

index 5ed142fba3d7c96dc736f3c0537e0df9bbf45043..9108d318d21d8cdcf98bf797248e304d849b051e 100644 (file)
@@ -7,8 +7,9 @@
  */
 package org.opendaylight.mdsal.binding.maven.api.gen.plugin;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.base.Joiner;
-import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSet.Builder;
 import com.google.common.collect.Table;
@@ -166,7 +167,7 @@ public final class CodeGeneratorImpl implements BasicCodeGenerator, BuildContext
     }
 
     private static void setOutputBaseDirAsSourceFolder(final File outputBaseDir, final MavenProject mavenProject) {
-        Preconditions.checkNotNull(mavenProject, "Maven project needs to be set in this phase");
+        requireNonNull(mavenProject, "Maven project needs to be set in this phase");
         mavenProject.addCompileSourceRoot(outputBaseDir.getPath());
     }
 
@@ -188,7 +189,7 @@ public final class CodeGeneratorImpl implements BasicCodeGenerator, BuildContext
 
     @Override
     public void setBuildContext(final BuildContext buildContext) {
-        this.buildContext = Preconditions.checkNotNull(buildContext);
+        this.buildContext = requireNonNull(buildContext);
     }
 
     private Set<File> generateYangModuleInfo(final File outputBaseDir, final Module module, final SchemaContext ctx,
index ccd08ed834697347afb18d69948537fc83d6b7d1..91ca03256d38da8046752b9f61bb9403d66d8c4e 100644 (file)
@@ -7,7 +7,8 @@
  */
 package org.opendaylight.mdsal.binding.dom.adapter;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.collect.Maps;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -35,7 +36,7 @@ public class BindingDOMDataTreeListenerAdapter extends AbstractBindingAdapter<Da
     protected BindingDOMDataTreeListenerAdapter(final DataTreeListener delegate,
             final BindingToNormalizedNodeCodec codec, final LogicalDatastoreType store) {
         super(codec, delegate);
-        this.store = Preconditions.checkNotNull(store, "store");
+        this.store = requireNonNull(store, "store");
     }
 
     @Override
index 879e8a868deff453940146c71abbca2b0d5fa202..5497b4e6b2c61db341424dd1a83828fdde3522c3 100644 (file)
@@ -7,7 +7,8 @@
  */
 package org.opendaylight.mdsal.binding.dom.adapter;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import org.opendaylight.mdsal.binding.api.DataTreeChangeListener;
 import org.opendaylight.yangtools.concepts.AbstractListenerRegistration;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
@@ -19,7 +20,7 @@ class BindingDataTreeChangeListenerRegistration<L extends DataTreeChangeListener
 
     BindingDataTreeChangeListenerRegistration(final L listener, final ListenerRegistration<?> domReg) {
         super(listener);
-        this.domReg = Preconditions.checkNotNull(domReg);
+        this.domReg = requireNonNull(domReg);
     }
 
     @Override
index a2a13ef2d86c4761594cf2926c47604bd1d013eb..0f1322a7e7aeec33cf7924c8d52a09b7f9e25279 100644 (file)
@@ -7,7 +7,8 @@
  */
 package org.opendaylight.mdsal.binding.dom.adapter.invoke;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
@@ -20,7 +21,7 @@ final class LocalNameRpcServiceInvoker extends AbstractMappedRpcInvoker<String>
 
     private LocalNameRpcServiceInvoker(final QNameModule module, final Map<String, Method> map) {
         super(map);
-        this.module = Preconditions.checkNotNull(module);
+        this.module = requireNonNull(module);
     }
 
     static RpcServiceInvoker instanceFor(final QNameModule module, final Map<QName, Method> qnameToMethod) {
index 3933b0328bf69a5feb37634c88ca474ee4b458b8..aeecbbbb9247b328dcb92cd5f94d7b6eae5edc20 100644 (file)
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.mdsal.binding.dom.codec.osgi.impl;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.io.Resources;
@@ -46,7 +46,7 @@ final class ModuleInfoBundleTracker implements BundleTrackerCustomizer<Collectio
     private volatile boolean starting = true;
 
     ModuleInfoBundleTracker(final OsgiModuleInfoRegistry moduleInfoRegistry) {
-        this.moduleInfoRegistry = checkNotNull(moduleInfoRegistry);
+        this.moduleInfoRegistry = requireNonNull(moduleInfoRegistry);
     }
 
     void finishStart() {
index 1370f5e170408434697a7421eefb79327779720f..8fdf9f8c96a48939f9425ce12bf3c6e718dbc7de 100644 (file)
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.mdsal.binding.dom.codec.osgi.impl;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Objects.requireNonNull;
 
 import javax.annotation.concurrent.GuardedBy;
 import org.opendaylight.mdsal.binding.generator.api.ModuleInfoRegistry;
@@ -37,9 +37,9 @@ final class OsgiModuleInfoRegistry implements ModuleInfoRegistry {
     OsgiModuleInfoRegistry(final ModuleInfoRegistry moduleInfoRegistry,
         final SchemaContextProvider schemaContextProvider, final SimpleBindingRuntimeContextService runtimeContext) {
 
-        this.moduleInfoRegistry = checkNotNull(moduleInfoRegistry);
-        this.schemaContextProvider = checkNotNull(schemaContextProvider);
-        this.runtimeContext = checkNotNull(runtimeContext);
+        this.moduleInfoRegistry = requireNonNull(moduleInfoRegistry);
+        this.schemaContextProvider = requireNonNull(schemaContextProvider);
+        this.runtimeContext = requireNonNull(runtimeContext);
     }
 
     @SuppressWarnings("checkstyle:illegalCatch")
@@ -70,7 +70,7 @@ final class OsgiModuleInfoRegistry implements ModuleInfoRegistry {
         private final ObjectRegistration<YangModuleInfo> inner;
 
         ObjectRegistrationWrapper(final ObjectRegistration<YangModuleInfo> inner) {
-            this.inner = checkNotNull(inner);
+            this.inner = requireNonNull(inner);
         }
 
         @Override
index 4c56edcca42335129a3dd774d67ce94d2efb101c..a4bb7bdb7a31bfc58ce1cfa9a28573c0b8c27fcc 100644 (file)
@@ -7,9 +7,9 @@
  */
 package org.opendaylight.mdsal.binding.dom.codec.osgi.impl;
 
-import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Verify.verifyNotNull;
+import static java.util.Objects.requireNonNull;
 
 import com.google.common.util.concurrent.ListenableFuture;
 import javax.annotation.concurrent.GuardedBy;
@@ -39,8 +39,8 @@ final class SimpleBindingRuntimeContextService extends
     SimpleBindingRuntimeContextService(final BundleContext context, final ClassLoadingStrategy strategy,
         final SchemaSourceProvider<YangTextSchemaSource> sourceProvider) {
         super(context, BindingRuntimeContextListener.class, null);
-        this.sourceProvider = checkNotNull(sourceProvider);
-        this.strategy = checkNotNull(strategy);
+        this.sourceProvider = requireNonNull(sourceProvider);
+        this.strategy = requireNonNull(strategy);
     }
 
     @Override
index e7ad321324bc532b8611b89a235d0e972a82d2ca..9bed830009c7bd4eda1f2c625cf7c7a1ec41996f 100644 (file)
@@ -8,7 +8,8 @@
 
 package org.opendaylight.mdsal.binding.dom.codec.gen.impl;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import java.util.HashMap;
 import java.util.Map;
 import org.opendaylight.mdsal.binding.dom.codec.util.BindingSchemaMapping;
@@ -46,8 +47,8 @@ abstract class DataNodeContainerSerializerSource extends DataObjectSerializerSou
     DataNodeContainerSerializerSource(final AbstractGenerator generator, final GeneratedType type,
             final DataNodeContainer node) {
         super(generator);
-        this.dtoType = Preconditions.checkNotNull(type);
-        this.schemaNode = Preconditions.checkNotNull(node);
+        this.dtoType = requireNonNull(type);
+        this.schemaNode = requireNonNull(node);
     }
 
     /**
index 9d3a0309d3154974ffc7a12e1721c3ca2931ce40..8ec0a4d6312113c7b1c36dba6629ae9726e13c41 100644 (file)
@@ -7,7 +7,8 @@
  */
 package org.opendaylight.mdsal.binding.dom.codec.gen.impl;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import org.opendaylight.mdsal.binding.dom.codec.gen.spi.AbstractSource;
 import org.opendaylight.mdsal.binding.generator.api.ClassLoadingStrategy;
 import org.opendaylight.mdsal.binding.generator.impl.GeneratedClassLoadingStrategy;
@@ -35,7 +36,7 @@ abstract class DataObjectSerializerSource extends AbstractSource {
      * @param generator Parent generator
      */
     DataObjectSerializerSource(final AbstractGenerator generator) {
-        this.generator = Preconditions.checkNotNull(generator);
+        this.generator = requireNonNull(generator);
     }
 
     @SuppressWarnings("unchecked")
index 951635e2c7848781a2790efd68735f41b01599b1..743b852535b671ed409ff69f7ae40d146af12d94 100644 (file)
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.mdsal.binding.dom.codec.gen.spi;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
 
 /**
  * Definition of static property for generated class.
@@ -27,9 +27,9 @@ public class StaticConstantDefinition {
     private final Object value;
 
     public StaticConstantDefinition(final String name, final Class<?> type, final Object value) {
-        this.name = Preconditions.checkNotNull(name);
-        this.type = Preconditions.checkNotNull(type);
-        this.value = Preconditions.checkNotNull(value);
+        this.name = requireNonNull(name);
+        this.type = requireNonNull(type);
+        this.value = requireNonNull(value);
     }
 
     public String getName() {
index dc30e1243cc8768f9d0acb1e49cb87c0ebcf50ac..7b594e92b3ccc42598c5068b187bc23b3a89b489 100644 (file)
@@ -7,7 +7,8 @@
  */
 package org.opendaylight.mdsal.binding.dom.codec.impl;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
@@ -23,8 +24,8 @@ final class BindingNormalizedNodeCache extends CacheLoader<DataObject, Normalize
 
     BindingNormalizedNodeCache(final AbstractBindingNormalizedNodeCacheHolder cacheHolder,
             final DataContainerCodecContext<?, ?> subtreeRoot) {
-        this.cacheHolder = Preconditions.checkNotNull(cacheHolder, "cacheHolder");
-        this.subtreeRoot = Preconditions.checkNotNull(subtreeRoot, "subtreeRoot");
+        this.cacheHolder = requireNonNull(cacheHolder, "cacheHolder");
+        this.subtreeRoot = requireNonNull(subtreeRoot, "subtreeRoot");
     }
 
     @Override
index fc982428b8427d02e061d3aab26250daeb2cfaf9..03cf03a1ced79a6afbe8e72a471c6bb818be510a 100644 (file)
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.mdsal.binding.dom.codec.impl;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.base.Preconditions;
 import java.io.IOException;
 import java.util.AbstractMap;
@@ -35,8 +37,8 @@ final class BindingToNormalizedStreamWriter implements BindingStreamEventWriter,
 
     BindingToNormalizedStreamWriter(final NodeCodecContext<?> rootNodeSchema,
             final NormalizedNodeStreamWriter delegate) {
-        this.rootNodeSchema = Preconditions.checkNotNull(rootNodeSchema);
-        this.delegate = Preconditions.checkNotNull(delegate);
+        this.rootNodeSchema = requireNonNull(rootNodeSchema);
+        this.delegate = requireNonNull(delegate);
     }
 
     static BindingToNormalizedStreamWriter create(final NodeCodecContext<?> schema,
index 95e43f688c6a01c1a2284bd5b108617a1fa16c3e..560e7332526b614f0a03be476800c8b5daee324b 100644 (file)
@@ -7,7 +7,8 @@
  */
 package org.opendaylight.mdsal.binding.dom.codec.impl;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.base.Throwables;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -34,9 +35,9 @@ final class EncapsulatedValueCodec extends ReflectionBasedCodec implements Schem
     private EncapsulatedValueCodec(final Class<?> typeClz, final MethodHandle constructor, final MethodHandle getter,
             final Class<?> valueType) {
         super(typeClz);
-        this.constructor = Preconditions.checkNotNull(constructor);
-        this.getter = Preconditions.checkNotNull(getter);
-        this.valueType = Preconditions.checkNotNull(valueType);
+        this.constructor = requireNonNull(constructor);
+        this.getter = requireNonNull(getter);
+        this.valueType = requireNonNull(valueType);
     }
 
     static Callable<EncapsulatedValueCodec> loader(final Class<?> typeClz, TypeDefinition<?> typeDef) {
index 06c8c2718f8678de26e9ae1354c2c0de6493e8d1..cc98fb0bedac78eb1401bb3b83993718cbb9b535 100644 (file)
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.mdsal.binding.dom.codec.impl;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.base.Preconditions;
 import org.opendaylight.mdsal.binding.generator.util.BindingRuntimeContext;
 import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections;
@@ -18,7 +20,7 @@ final class IdentityCodec implements Codec<QName, Class<?>> {
     private final BindingRuntimeContext context;
 
     IdentityCodec(final BindingRuntimeContext context) {
-        this.context = Preconditions.checkNotNull(context);
+        this.context = requireNonNull(context);
     }
 
     @Override
index b077a4969ad6b38457f8b3b7b37db420cac9400e..becd7c208a73f185a055fdec00f55a4aa64318fc 100644 (file)
@@ -7,7 +7,8 @@
  */
 package org.opendaylight.mdsal.binding.dom.codec.impl;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.collect.Iterables;
 import java.util.ArrayList;
 import java.util.List;
@@ -20,7 +21,7 @@ final class InstanceIdentifierCodec implements Codec<YangInstanceIdentifier, Ins
     private final BindingCodecContext context;
 
     InstanceIdentifierCodec(final BindingCodecContext context) {
-        this.context = Preconditions.checkNotNull(context);
+        this.context = requireNonNull(context);
     }
 
     @Override
index c2f0e676c6760bb6311da76c70e70ff2ebc70c8d..6e92a5af976364fffa50c48eb302f828f6598c3a 100644 (file)
@@ -7,7 +7,8 @@
  */
 package org.opendaylight.mdsal.binding.dom.codec.impl;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.opendaylight.mdsal.binding.generator.util.BindingRuntimeContext;
 import org.opendaylight.yangtools.yang.binding.Augmentation;
@@ -27,7 +28,7 @@ public final class MissingSchemaForClassException extends MissingSchemaException
 
     private MissingSchemaForClassException(final Class<?> clz) {
         super(String.format("Schema is not available for %s", clz));
-        this.bindingClass = Preconditions.checkNotNull(clz);
+        this.bindingClass = requireNonNull(clz);
     }
 
     static MissingSchemaForClassException forClass(final Class<?> clz) {
index a609e390b5738d6784eadc0ee48719c35ceda507..1f3a7e238323114c9ff63db03c4fde1f1569de1e 100644 (file)
@@ -7,14 +7,14 @@
  */
 package org.opendaylight.mdsal.binding.dom.codec.impl;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
 
 abstract class ReflectionBasedCodec extends ValueTypeCodec {
 
     private final Class<?> typeClass;
 
     ReflectionBasedCodec(final Class<?> typeClass) {
-        this.typeClass = Preconditions.checkNotNull(typeClass);
+        this.typeClass = requireNonNull(typeClass);
     }
 
     protected final Class<?> getTypeClass() {
index 33b2b797ac88a01a4c7e6ca8518aea45e0f8fcb6..23355d784706e0ed79a1bf3b8c2e520cfcdac64a 100644 (file)
@@ -8,8 +8,8 @@
 package org.opendaylight.mdsal.binding.dom.codec.impl;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Verify.verify;
+import static java.util.Objects.requireNonNull;
 
 import com.google.common.base.Throwables;
 import com.google.common.base.Verify;
@@ -219,8 +219,8 @@ final class SchemaRootCodecContext<D extends DataObject> extends DataContainerCo
 
     private ActionCodecContext prepareActionContext(final int inputOffset, final int outputOffset,
             final int expectedArgsLength, final Class<? extends Action<?, ?, ?>> action, final Class<?> actionType) {
-        final ParameterizedType paramType = checkNotNull(ClassLoaderUtils.findParameterizedType(action, actionType),
-            "There does not exist any ParameterType in %s", action);
+        final ParameterizedType paramType = requireNonNull(ClassLoaderUtils.findParameterizedType(action, actionType),
+            () -> "There does not exist any ParameterType in " + action);
         final Type[] args = paramType.getActualTypeArguments();
         checkArgument(args.length == expectedArgsLength, "Unexpected (%s) Action generatic arguments", args.length);
         final ActionDefinition schema = factory().getRuntimeContext().getActionDefinition(action);
index 5b1ae9eeb1b4f4c1fdd0321d7d7858d1705914f1..6143f08ef59262eeb9bdd5c84e45e2676a2aecb2 100644 (file)
@@ -7,7 +7,8 @@
  */
 package org.opendaylight.mdsal.binding.dom.codec.impl;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.base.Throwables;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -28,8 +29,8 @@ final class UnionValueOptionContext {
 
     UnionValueOptionContext(final Class<?> unionType, final Class<?> valueType, final Method getter,
             final Codec<Object, Object> codec) {
-        this.bindingType = Preconditions.checkNotNull(valueType);
-        this.codec = Preconditions.checkNotNull(codec);
+        this.bindingType = requireNonNull(valueType);
+        this.codec = requireNonNull(codec);
 
         try {
             this.getter = MethodHandles.publicLookup().unreflect(getter).asType(OBJECT_TYPE);
index 31c4645da1002cb9e8bbef65a2ba7e19603d08fa..609bec050df25543207534dc1062218b7fabfecc 100644 (file)
@@ -7,7 +7,8 @@
  */
 package org.opendaylight.mdsal.binding.dom.codec.util;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import java.io.IOException;
 import org.opendaylight.yangtools.yang.binding.BindingStreamEventWriter;
 import org.opendaylight.yangtools.yang.binding.DataContainer;
@@ -27,7 +28,7 @@ public final class ChoiceDispatchSerializer implements DataObjectSerializerImple
 
     @SuppressWarnings("rawtypes")
     private ChoiceDispatchSerializer(final Class choiceClass) {
-        this.choiceClass = Preconditions.checkNotNull(choiceClass);
+        this.choiceClass = requireNonNull(choiceClass);
     }
 
     public static ChoiceDispatchSerializer from(final Class<? extends DataContainer> choiceClass) {
index 4b8602af552dbdb922fb1add910dec65462f67c6..61528083578d736b0c70f3cb464703454be095d8 100644 (file)
@@ -7,9 +7,9 @@
  */
 package org.opendaylight.mdsal.binding.dom.codec.test;
 
+import static java.util.Objects.requireNonNull;
 import static org.junit.Assert.assertNotNull;
 
-import com.google.common.base.Preconditions;
 import java.util.HashSet;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -121,7 +121,7 @@ public class AugmentationClassDiscoveredAfterCodecTest {
         }
 
         protected ClassExcludingClassLoadingStrategy(final GeneratedClassLoadingStrategy delegate) {
-            this.delegate = Preconditions.checkNotNull(delegate);
+            this.delegate = requireNonNull(delegate);
         }
 
         @Override
index 5386a77593848be8dea0c6ef27edb942ee0465a6..c4f670b3606c784e1eaac8a23b4f204d03b58834 100644 (file)
@@ -7,8 +7,8 @@
  */
 package org.opendaylight.mdsal.binding.generator.util;
 
-import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
+import static java.util.Objects.requireNonNull;
 
 import com.google.common.base.Preconditions;
 import java.net.URI;
@@ -36,7 +36,7 @@ public final class YangSchemaUtils {
     }
 
     public static QName getAugmentationQName(final AugmentationSchemaNode augmentation) {
-        checkNotNull(augmentation, "Augmentation must not be null.");
+        requireNonNull(augmentation, "Augmentation must not be null.");
         final QName identifier = getAugmentationIdentifier(augmentation);
         if (identifier != null) {
             return identifier;
index f9e1abb9fb961daa2b59eaa3e13cd0389b67ac08..4441081f771c231059f4e14c29f91f0719ad7af1 100644 (file)
@@ -831,7 +831,7 @@ public abstract class AbstractTypeProvider implements TypeProvider {
      */
     private GeneratedTransferObject wrapJavaTypeIntoTO(final String basePackageName, final TypeDefinition<?> typedef,
             final Type javaType, final String moduleName) {
-        Preconditions.checkNotNull(javaType, "javaType cannot be null");
+        requireNonNull(javaType, "javaType cannot be null");
 
         final GeneratedTOBuilder genTOBuilder = typedefToTransferObject(basePackageName, typedef, moduleName);
         genTOBuilder.setRestrictions(BindingGeneratorUtil.getRestrictions(typedef));
@@ -887,8 +887,8 @@ public abstract class AbstractTypeProvider implements TypeProvider {
      */
     public List<GeneratedTOBuilder> provideGeneratedTOBuildersForUnionTypeDef(final JavaTypeName typeName,
             final UnionTypeDefinition typedef, final SchemaNode parentNode) {
-        Preconditions.checkNotNull(typedef, "Type Definition cannot be NULL!");
-        Preconditions.checkNotNull(typedef.getQName(), "Type definition QName cannot be NULL!");
+        requireNonNull(typedef, "Type Definition cannot be NULL!");
+        requireNonNull(typedef.getQName(), "Type definition QName cannot be NULL!");
 
         final List<GeneratedTOBuilder> generatedTOBuilders = new ArrayList<>();
         final List<TypeDefinition<?>> unionTypes = typedef.getTypes();
@@ -1325,9 +1325,9 @@ public abstract class AbstractTypeProvider implements TypeProvider {
         final TypeDefinition<?> type = CompatUtils.compatLeafType(node);
         final QName typeQName = type.getQName();
         final TypeDefinition<?> base = baseTypeDefForExtendedType(type);
-        Preconditions.checkNotNull(type, "Cannot provide default construction for null type of %s", node);
-        Preconditions.checkNotNull(defaultValue, "Cannot provide default construction for null default statement of %s",
-                node);
+        requireNonNull(type, () -> "Cannot provide default construction for null type of " + node);
+        requireNonNull(defaultValue, () -> "Cannot provide default construction for null default statement of "
+            + node);
 
         final StringBuilder sb = new StringBuilder();
         String result = null;
index e416b869a632b7c20ffe087229eb7b5b6d15fabf..db4e8a4ce249675e37e2bb6ec46c6091f4afb565 100644 (file)
@@ -7,7 +7,8 @@
  */
 package org.opendaylight.mdsal.binding.generator.impl;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import java.io.File;
 import java.net.URISyntaxException;
 import java.net.URL;
@@ -27,8 +28,7 @@ public abstract class AbstractTypesTest {
     @Before
     public void loadTestResources() throws URISyntaxException {
         File testSourcesDir = new File(testSourcesDirUrl.toURI());
-        File[] testFiles = Preconditions.checkNotNull(testSourcesDir.listFiles(), testSourcesDir
-                + " does not denote a directory");
+        File[] testFiles = requireNonNull(testSourcesDir.listFiles(), testSourcesDir + " does not denote a directory");
         testModels = new HashSet<>();
         for (File file : testFiles) {
             if (file.isFile()) {
index 891e2e09625086504677337537fe9f3cb878d0c7..c7b1c3728446c514cd79f71e1717f6ac76b0c404 100644 (file)
@@ -10,7 +10,6 @@ package org.opendaylight.mdsal.binding.java.api.generator;
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.base.MoreObjects;
-import com.google.common.base.Preconditions;
 import com.google.common.collect.HashBasedTable;
 import com.google.common.collect.Table;
 import java.io.File;
@@ -79,7 +78,7 @@ public final class GeneratorJavaFile {
      * @param types set of types for which JAVA code should be generated
      */
     public GeneratorJavaFile(final Collection<? extends Type> types) {
-        this.types = Preconditions.checkNotNull(types);
+        this.types = requireNonNull(types);
         generators.add(new InterfaceGenerator());
         generators.add(new TOGenerator());
         generators.add(new EnumGenerator());
index ac281ca986e2409dc4d6ef71446e4a78fb4ee967..06af2a195f2f62e23035d01bff10a3ae93520674 100644 (file)
@@ -7,8 +7,9 @@
  */
 package org.opendaylight.mdsal.binding.spec.reflect;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
 import com.google.common.base.Throwables;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -48,9 +49,9 @@ public final class StringValueObjectFactory<T> {
     private final T template;
 
     private StringValueObjectFactory(final T template, final MethodHandle constructor, final MethodHandle setter) {
-        this.template = Preconditions.checkNotNull(template);
+        this.template = requireNonNull(template);
         this.constructor = constructor.bindTo(template);
-        this.setter = Preconditions.checkNotNull(setter);
+        this.setter = requireNonNull(setter);
     }
 
     public static <T> StringValueObjectFactory<T> create(final Class<T> clazz, final String templateString) {
@@ -137,7 +138,7 @@ public final class StringValueObjectFactory<T> {
 
     @SuppressWarnings("checkstyle:illegalCatch")
     public T newInstance(final String string) {
-        Preconditions.checkNotNull(string, "Argument may not be null");
+        requireNonNull(string, "Argument may not be null");
 
         try {
             final T ret = (T) constructor.invokeExact();
index 8b1f5db61808d440b22e181920bc6ba386be9c21..96f6d156e734f1e9b45fba70ea2198c049c887b3 100644 (file)
@@ -7,9 +7,10 @@
  */
 package org.opendaylight.mdsal.binding.testutils;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.util.concurrent.FluentFuture;
 import com.google.common.util.concurrent.Futures;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -59,26 +60,26 @@ public class DataBrokerFailuresImpl extends ForwardingDataBroker implements Data
     @Override
     public void failReads(ReadFailedException exception) {
         unfailReads();
-        readException = Objects.requireNonNull(exception, "exception == null");
+        readException = requireNonNull(exception, "exception == null");
     }
 
     @Override
     public void failReads(int howManyTimes, ReadFailedException exception) {
         unfailReads();
         howManyFailingReads.set(howManyTimes);
-        readException = Objects.requireNonNull(exception, "exception == null");
+        readException = requireNonNull(exception, "exception == null");
     }
 
     @Override
     public void failCommits(TransactionCommitFailedException exception) {
         unfailCommits();
-        this.commitException = Objects.requireNonNull(exception, "exception == null");
+        this.commitException = requireNonNull(exception, "exception == null");
     }
 
     @Override
     public void failCommits(int howManyTimes, TransactionCommitFailedException exception) {
         howManyFailingCommits.set(howManyTimes);
-        this.commitException = Objects.requireNonNull(exception, "exception == null");
+        this.commitException = requireNonNull(exception, "exception == null");
     }
 
     @Override
index dc8864cc9e1ad54ecc0ba1ce73306e493a31808d..6eda831e44517aa4dd3b59731121266a66fd65ef 100644 (file)
@@ -8,8 +8,9 @@
 
 package org.opendaylight.mdsal.binding.javav2.api;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
 import java.io.Serializable;
 import java.util.Objects;
 import javax.annotation.Nonnull;
@@ -32,8 +33,8 @@ public final class DataTreeIdentifier<T extends TreeNode> implements Immutable,
     private final LogicalDatastoreType datastoreType;
 
     private DataTreeIdentifier(final LogicalDatastoreType datastoreType, final InstanceIdentifier<T> rootIdentifier) {
-        this.datastoreType = Preconditions.checkNotNull(datastoreType);
-        this.rootIdentifier = Preconditions.checkNotNull(rootIdentifier);
+        this.datastoreType = requireNonNull(datastoreType);
+        this.rootIdentifier = requireNonNull(rootIdentifier);
     }
 
     public static <T extends TreeNode> DataTreeIdentifier<T> create(final LogicalDatastoreType datastoreType,
index 02f4bbe815a3ce1c5244090626613a3b7123f4b4..a49e507a749f06624a49ed0d700eb8e40b8d731e 100644 (file)
@@ -8,8 +8,9 @@
 
 package org.opendaylight.mdsal.binding.javav2.api;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
@@ -23,11 +24,11 @@ public class DataTreeListeningException extends Exception {
     private static final long serialVersionUID = 1L;
 
     public DataTreeListeningException(@Nonnull String message, @Nullable Throwable cause) {
-        super(Preconditions.checkNotNull(message, "message"), cause);
+        super(requireNonNull(message, "message"), cause);
     }
 
     public DataTreeListeningException(@Nonnull String message) {
-        super(Preconditions.checkNotNull(message, "message"));
+        super(requireNonNull(message, "message"));
     }
 
 }
index 473df96c52b57e7b90c3cb4a8c56dc03e58eca47..c005db927eaf1167558f4258ae3003219ba1f7ae 100644 (file)
@@ -8,8 +8,9 @@
 
 package org.opendaylight.mdsal.binding.javav2.api;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
 import javax.annotation.Nonnull;
 
 /**
@@ -23,10 +24,10 @@ public class DataTreeProducerBusyException extends DataTreeProducerException {
 
 
     public DataTreeProducerBusyException(@Nonnull final String message, @Nonnull final Throwable cause) {
-        super(Preconditions.checkNotNull(message, "message"), cause);
+        super(requireNonNull(message, "message"), cause);
     }
 
     public DataTreeProducerBusyException(@Nonnull final String message) {
-        super(Preconditions.checkNotNull(message, "message"));
+        super(requireNonNull(message, "message"));
     }
 }
\ No newline at end of file
index 82f50d9d13a42c82e31cbed929c1714dbc33e0c7..1689a4b1517be62afb4a2ac4f7e3dbdc60903d50 100644 (file)
@@ -7,8 +7,9 @@
  */
 package org.opendaylight.mdsal.binding.javav2.dom.adapter.impl.data.tree;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.FluentFuture;
 import com.google.common.util.concurrent.SettableFuture;
 import java.util.Collection;
@@ -38,8 +39,8 @@ public class BindingDOMDataTreeCommitCohortAdapter<T extends TreeNode> implement
 
     public BindingDOMDataTreeCommitCohortAdapter(final BindingToNormalizedNodeCodec codec,
             final DataTreeCommitCohort<T> cohort) {
-        this.codec = Preconditions.checkNotNull(codec);
-        this.cohort = Preconditions.checkNotNull(cohort);
+        this.codec = requireNonNull(codec);
+        this.cohort = requireNonNull(cohort);
     }
 
     @Nonnull
index e918940b5761f1e230841daa4f9dee1724593b7d..7b690553251f610f6e62c9803ef62a661f4dae73 100644 (file)
@@ -7,8 +7,9 @@
  */
 package org.opendaylight.mdsal.binding.javav2.dom.adapter.impl.data.tree;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
 import javax.annotation.Nonnull;
 import org.opendaylight.mdsal.binding.javav2.api.DataTreeCommitCohort;
 import org.opendaylight.mdsal.binding.javav2.api.DataTreeCommitCohortRegistry;
@@ -31,8 +32,8 @@ public final class BindingDOMDataTreeCommitCohortRegistryAdapter implements Data
 
     private BindingDOMDataTreeCommitCohortRegistryAdapter(final BindingToNormalizedNodeCodec codec,
             final DOMDataTreeCommitCohortRegistry registry) {
-        this.codec = Preconditions.checkNotNull(codec);
-        this.registry = Preconditions.checkNotNull(registry);
+        this.codec = requireNonNull(codec);
+        this.registry = requireNonNull(registry);
     }
 
     /**
index c75c89e8c78ff5d091c782ebe84a0f529a5c0f1b..648579ac8ddcfe19bf9236486a34ecd4c8bf476d 100644 (file)
@@ -7,8 +7,9 @@
  */
 package org.opendaylight.mdsal.binding.javav2.dom.adapter.impl.data.tree;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
 import com.google.common.collect.Maps;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -43,9 +44,9 @@ public class BindingDOMDataTreeListenerAdapter implements DOMDataTreeListener {
 
     public BindingDOMDataTreeListenerAdapter(final DataTreeListener delegate,
             final BindingToNormalizedNodeCodec codec, final LogicalDatastoreType store) {
-        this.delegate = Preconditions.checkNotNull(delegate, "delegate");
-        this.codec = Preconditions.checkNotNull(codec, "codec");
-        this.store = Preconditions.checkNotNull(store, "store");
+        this.delegate = requireNonNull(delegate, "delegate");
+        this.codec = requireNonNull(codec, "codec");
+        this.store = requireNonNull(store, "store");
     }
 
     @Override
index 772c42672ec16be823fded0b86f5bdf134615116..2453e125838685d92159bf3069dad7358f6e47fc 100644 (file)
@@ -7,8 +7,9 @@
  */
 package org.opendaylight.mdsal.binding.javav2.dom.adapter.impl.data.tree;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
 import java.util.Collection;
 import javax.annotation.Nonnull;
 import org.opendaylight.mdsal.binding.javav2.api.CursorAwareWriteTransaction;
@@ -32,7 +33,7 @@ public final class BindingDOMDataTreeProducerAdapter implements DataTreeProducer
 
     private BindingDOMDataTreeProducerAdapter(final DOMDataTreeProducer delegate,
             final BindingToNormalizedNodeCodec codec) {
-        this.delegate = Preconditions.checkNotNull(delegate);
+        this.delegate = requireNonNull(delegate);
         this.codec = codec;
     }
 
index 34dbe1667af383732d64db73cf91d6b3e224a08e..2918f3d5c18fe0f3876702943469527d15dde595 100644 (file)
@@ -7,8 +7,9 @@
  */
 package org.opendaylight.mdsal.binding.javav2.dom.adapter.impl.data.tree;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
 import java.util.Collection;
 import javax.annotation.Nonnull;
 import org.opendaylight.mdsal.binding.javav2.api.DataTreeIdentifier;
@@ -34,8 +35,8 @@ public final class BindingDOMDataTreeServiceAdapter implements DataTreeService {
 
     private BindingDOMDataTreeServiceAdapter(final DOMDataTreeService delegate,
             final BindingToNormalizedNodeCodec codec) {
-        this.delegate = Preconditions.checkNotNull(delegate, "delegate");
-        this.codec = Preconditions.checkNotNull(codec, "codec");
+        this.delegate = requireNonNull(delegate, "delegate");
+        this.codec = requireNonNull(codec, "codec");
     }
 
     /**
index 8156d8d891fe429a48e873ae27eaa2f3b75f28f5..6db4e816d6fab6b2567babe9975e452d928f07a9 100644 (file)
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.mdsal.binding.javav2.dom.adapter.impl.notification;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Throwables;
@@ -114,7 +116,7 @@ public final class NotificationListenerInvoker {
     @SuppressWarnings("checkstyle:IllegalCatch")
     public void invokeNotification(@Nonnull final NotificationListener impl, @Nonnull final QName notificationName,
             @Nullable final Instantiable<?> input) {
-        Preconditions.checkNotNull(impl, "implementation must be supplied");
+        requireNonNull(impl, "implementation must be supplied");
         final MethodHandle invoker = methodInvokers.get(notificationName);
         Preconditions.checkArgument(invoker != null, "Supplied notification is not valid for implementation %s", impl);
         try {
index 3495ee850d3fe60ca70617e28bfe5b6505b476a7..25d6b210892f5f11a6ec5851b8db52fefc3a3d8e 100644 (file)
@@ -61,9 +61,9 @@ class RpcServiceAdapter implements InvocationHandler {
 
     RpcServiceAdapter(final Class<? extends Rpc<?, ?>> 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);
         strategy = createStrategy(type);
         proxy = (Rpc<?, ?>) Proxy.newProxyInstance(type.getClassLoader(), new Class[] { type }, this);
     }
index e096a07c505899832347fc0f85ba1a1205469265..41ed4b4f78cbbd947e42c92d7c6d3e5be87cc56d 100644 (file)
@@ -7,8 +7,9 @@
  */
 package org.opendaylight.mdsal.binding.javav2.dom.adapter.registration;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
 import org.opendaylight.mdsal.binding.javav2.api.DataTreeListener;
 import org.opendaylight.yangtools.concepts.AbstractListenerRegistration;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
@@ -27,7 +28,7 @@ public class BindingDataTreeListenerRegistration<L extends DataTreeListener>
 
     public BindingDataTreeListenerRegistration(final L listener, final ListenerRegistration<?> domReg) {
         super(listener);
-        this.domReg = Preconditions.checkNotNull(domReg);
+        this.domReg = requireNonNull(domReg);
     }
 
     @Override
index 94fef6b73b5ae5528d23f17e976c63960303def0..62754501b8bebfc7f2556cc54846a0f3e246a7a8 100644 (file)
@@ -7,8 +7,9 @@
  */
 package org.opendaylight.mdsal.binding.javav2.dom.codec.generator.impl;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
 
 /**
  * Definition of static property for Binding objects.
@@ -29,9 +30,9 @@ public class StaticBindingProperty {
     private final Object value;
 
     public StaticBindingProperty(final String name, final Class<?> type, final Object value) {
-        this.name = Preconditions.checkNotNull(name);
-        this.type = Preconditions.checkNotNull(type);
-        this.value = Preconditions.checkNotNull(value);
+        this.name = requireNonNull(name);
+        this.type = requireNonNull(type);
+        this.value = requireNonNull(value);
     }
 
     public String getName() {
index 49debf64eff18c2efb268335c109fd5cc5338ace..4715f6d640dc7cad0b3d86097ec5f4ad72987c98 100644 (file)
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.mdsal.binding.javav2.dom.codec.generator.spi.generator;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
 import com.google.common.base.Preconditions;
 import com.google.common.cache.CacheBuilder;
@@ -83,7 +85,7 @@ public abstract class AbstractStreamWriterGenerator extends AbstractGenerator im
     }
 
     protected AbstractStreamWriterGenerator(final JavassistUtils utils) {
-        this.javassist = Preconditions.checkNotNull(utils, "JavassistUtils instance is required.");
+        this.javassist = requireNonNull(utils, "JavassistUtils instance is required.");
         this.serializeArguments = new CtClass[] { javassist.asCtClass(TreeNodeSerializerRegistry.class),
                 javassist.asCtClass(TreeNode.class), javassist.asCtClass(BindingStreamEventWriter.class), };
         javassist.appendClassLoaderIfMissing(TreeNodeSerializerPrototype.class.getClassLoader());
index 3db728c108abcd6fde184acf91832c39515428d1..525f72da0ad1e80afbdf551200280d192dd2792f 100644 (file)
@@ -7,8 +7,9 @@
  */
 package org.opendaylight.mdsal.binding.javav2.dom.codec.generator.spi.source;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
 import java.util.ArrayList;
 import java.util.Collection;
 import org.opendaylight.mdsal.binding.javav2.dom.codec.generator.spi.generator.AbstractGenerator;
@@ -28,7 +29,7 @@ public abstract class AbstractAugmentSerializerSource extends AbstractDataNodeCo
                                            final Collection<AugmentationSchemaNode> augmentationSchemas) {
         // Note: passing first augmentation schema node just to avoid exceptions from super class.
         super(generator, type, augmentationSchemas.stream().findFirst().get());
-        this.augmentationSchemas = Preconditions.checkNotNull(augmentationSchemas);
+        this.augmentationSchemas = requireNonNull(augmentationSchemas);
     }
 
     /**
index 4102204a9486b0b87d07b72480d561a7ed533dd1..681eb4bffed2b3e9d66beb093cbd24d642baae8b 100755 (executable)
@@ -7,8 +7,9 @@
  */
 package org.opendaylight.mdsal.binding.javav2.dom.codec.generator.spi.source;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
@@ -56,8 +57,8 @@ public abstract class AbstractDataNodeContainerSerializerSource extends Abstract
     public AbstractDataNodeContainerSerializerSource(final AbstractGenerator generator, final GeneratedType type,
             final DataNodeContainer node) {
         super(generator);
-        this.dtoType = Preconditions.checkNotNull(type);
-        this.schemaNode = Preconditions.checkNotNull(node);
+        this.dtoType = requireNonNull(type);
+        this.schemaNode = requireNonNull(node);
     }
 
     /**
index 1153bed65046874cd34c71013957b5582494db89..487d6d2cbf3d5c5b3445c5f7349a2220871fa99b 100644 (file)
@@ -7,8 +7,9 @@
  */
 package org.opendaylight.mdsal.binding.javav2.dom.codec.generator.spi.source;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
 import org.opendaylight.mdsal.binding.javav2.dom.codec.generator.spi.generator.AbstractGenerator;
 import org.opendaylight.mdsal.binding.javav2.dom.codec.generator.spi.generator.AbstractStreamWriterGenerator;
 import org.opendaylight.mdsal.binding.javav2.generator.api.ClassLoadingStrategy;
@@ -39,7 +40,7 @@ public abstract class AbstractTreeNodeSerializerSource extends AbstractSource {
      *            -parent generator
      */
     AbstractTreeNodeSerializerSource(final AbstractGenerator generator) {
-        this.generator = Preconditions.checkNotNull(generator);
+        this.generator = requireNonNull(generator);
     }
 
     @SuppressWarnings("unchecked")
index 57641cfa50c638c45693688b49c393d5c753814d..9f6798aca9376d81af4093168e3d1931eddc493e 100755 (executable)
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.mdsal.binding.javav2.dom.codec.impl;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
 import com.google.common.base.Preconditions;
 import javax.xml.transform.dom.DOMSource;
@@ -29,7 +31,7 @@ public final class AnyxmlCodec implements Codec<DOMSource, Document> {
      *            - binding runtime context
      */
     public AnyxmlCodec(final BindingRuntimeContext context) {
-        this.context = Preconditions.checkNotNull(context);
+        this.context = requireNonNull(context);
     }
 
     @Override
index 65fbcd7c33a6f7b0b434713a689bdd3da56f8d9b..38c77f8a3e0f664c268b8dd0b1f0024bcd5a82df 100644 (file)
@@ -7,8 +7,9 @@
  */
 package org.opendaylight.mdsal.binding.javav2.dom.codec.impl;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
@@ -80,7 +81,7 @@ public class BindingNormalizedNodeCodecRegistry implements TreeNodeSerializerReg
      *            - serializer generator
      */
     public BindingNormalizedNodeCodecRegistry(final TreeNodeSerializerGenerator generator) {
-        this.generator = Preconditions.checkNotNull(generator);
+        this.generator = requireNonNull(generator);
         this.serializers = CacheBuilder.newBuilder().weakKeys().build(new GeneratorLoader());
     }
 
index 9268cc9d0b1599e3e79a131e672936b95f05da7b..c59f2510a76e771ae337304076e2c9ac33cd8908 100644 (file)
@@ -8,6 +8,7 @@
 package org.opendaylight.mdsal.binding.javav2.dom.codec.impl;
 
 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;
@@ -112,8 +113,8 @@ public final class BindingToNormalizedNodeCodec
      */
     public BindingToNormalizedNodeCodec(final GeneratedClassLoadingStrategy classLoadingStrategy,
             final BindingNormalizedNodeCodecRegistry codecRegistry, final boolean waitForSchema) {
-        this.classLoadingStrategy = Preconditions.checkNotNull(classLoadingStrategy, "classLoadingStrategy");
-        this.codecRegistry = Preconditions.checkNotNull(codecRegistry, "codecRegistry");
+        this.classLoadingStrategy = requireNonNull(classLoadingStrategy, "classLoadingStrategy");
+        this.codecRegistry = requireNonNull(codecRegistry, "codecRegistry");
         this.futureSchema = waitForSchema ? new FutureSchema(WAIT_DURATION_SEC, TimeUnit.SECONDS) : null;
     }
 
index 8a0a4f8d7050e0f3f93fcf52ce2e79c7d4aa8a1f..c514862749b866564d0c9534ac8883b1d5e52dc6 100644 (file)
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.mdsal.binding.javav2.dom.codec.impl;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
 import com.google.common.base.Preconditions;
 import org.opendaylight.mdsal.binding.javav2.runtime.context.BindingRuntimeContext;
@@ -30,7 +32,7 @@ public final class IdentityCodec implements Codec<QName, Class<?>> {
      *            - binding runtime context
      */
     public IdentityCodec(final BindingRuntimeContext context) {
-        this.context = Preconditions.checkNotNull(context);
+        this.context = requireNonNull(context);
     }
 
     @Override
index 60834d4c51b8b61ba5b14422bcbf100530611f0d..dccbf1ce22e93b22137955005440b1b3eb3f6a75 100644 (file)
@@ -7,8 +7,9 @@
  */
 package org.opendaylight.mdsal.binding.javav2.dom.codec.impl;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
 import com.google.common.collect.Iterables;
 import java.util.ArrayList;
 import java.util.List;
@@ -38,7 +39,7 @@ public final class InstanceIdentifierCodec implements Codec<YangInstanceIdentifi
      *            - binding codec context
      */
     public InstanceIdentifierCodec(final BindingCodecContext context) {
-        this.context = Preconditions.checkNotNull(context);
+        this.context = requireNonNull(context);
     }
 
     @Override
index 7af8e9cf8f7d53f1b9cb7adcb90f0b4c95f577f6..f155b8c37f786b273cb57874b9c21c74e92bf08f 100644 (file)
@@ -7,8 +7,9 @@
  */
 package org.opendaylight.mdsal.binding.javav2.dom.codec.impl.cache;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
@@ -38,7 +39,7 @@ public abstract class AbstractBindingNormalizedNodeCacheHolder {
             });
 
     protected AbstractBindingNormalizedNodeCacheHolder(@Nonnull final Set<Class<? extends TreeNode>> cacheSpec) {
-        cachedValues = Preconditions.checkNotNull(cacheSpec);
+        cachedValues = requireNonNull(cacheSpec);
     }
 
     public BindingNormalizedNodeCache getCachingSerializer(final DataContainerCodecContext<?, ?> childCtx) {
index cf9a69ff78a2c061b86928ccac2d28db6fd33ad3..84561ad2a019705e8a004219b0b9c9eede8eb112 100644 (file)
@@ -7,8 +7,9 @@
  */
 package org.opendaylight.mdsal.binding.javav2.dom.codec.impl.cache;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
@@ -32,8 +33,8 @@ public class BindingNormalizedNodeCache extends CacheLoader<TreeNode, Normalized
 
     public BindingNormalizedNodeCache(@Nonnull final AbstractBindingNormalizedNodeCacheHolder cacheHolder,
             @Nonnull final DataContainerCodecContext<?, ?> subtreeRoot) {
-        this.cacheHolder = Preconditions.checkNotNull(cacheHolder, "cacheHolder");
-        this.subtreeRoot = Preconditions.checkNotNull(subtreeRoot, "subtreeRoot");
+        this.cacheHolder = requireNonNull(cacheHolder, "cacheHolder");
+        this.subtreeRoot = requireNonNull(subtreeRoot, "subtreeRoot");
     }
 
     @Override
index f1bf7d2b7cdaf17cfc5da49de5b71b836b0233b9..e0b83261e80e8b4492286efd6bcbfc21462759a3 100644 (file)
@@ -7,8 +7,9 @@
  */
 package org.opendaylight.mdsal.binding.javav2.dom.codec.impl.cache;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
 import java.util.Set;
 import javax.annotation.Nonnull;
 import org.opendaylight.mdsal.binding.javav2.dom.codec.api.BindingNormalizedNodeCachingCodec;
@@ -32,7 +33,7 @@ public class CachingNormalizedNodeCodec<D extends TreeNode> extends AbstractBind
     public CachingNormalizedNodeCodec(final DataContainerCodecContext<D, ?> subtreeRoot,
             final Set<Class<? extends TreeNode>> cacheSpec) {
         super(cacheSpec);
-        this.context = Preconditions.checkNotNull(subtreeRoot);
+        this.context = requireNonNull(subtreeRoot);
     }
 
     @Nonnull
index b985e3f15077aa956ed81c12a7ab9a36f2ea566b..5b8bdf8f9ab927852693cb78cd45d1d060f29bfa 100644 (file)
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.mdsal.binding.javav2.dom.codec.impl.context;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Throwables;
@@ -126,8 +128,8 @@ public final class SchemaRootCodecContext<D extends TreeNode> extends DataContai
      * @return operation schema or null, if operation is not present in schema context.
      */
     private ContainerSchemaNode getOperationDataSchema(final SchemaContext schema, final SchemaPath path) {
-        Preconditions.checkNotNull(schema, "Schema context must not be null.");
-        Preconditions.checkNotNull(path, "Schema path must not be null.");
+        requireNonNull(schema, "Schema context must not be null.");
+        requireNonNull(path, "Schema path must not be null.");
         final Iterator<QName> it = path.getPathFromRoot().iterator();
         Preconditions.checkArgument(it.hasNext(), "Operation must have QName.");
         final QName operationName = it.next();
@@ -151,8 +153,8 @@ public final class SchemaRootCodecContext<D extends TreeNode> extends DataContai
     }
 
     private ContainerSchemaNode getOperationDataSchema(final OperationDefinition operation, final QName qname) {
-        Preconditions.checkNotNull(operation, "Operation Schema must not be null.");
-        Preconditions.checkNotNull(qname, "QName must not be null.");
+        requireNonNull(operation, "Operation Schema must not be null.");
+        requireNonNull(qname, "QName must not be null.");
         switch (qname.getLocalName()) {
             case "input":
                 return operation.getInput();
index 6b143066ccd1e559c607032bc14542efcd172084..e9e125aa084130ad305c68a396f6eaa467e079f9 100644 (file)
@@ -7,8 +7,9 @@
  */
 package org.opendaylight.mdsal.binding.javav2.dom.codec.impl.context;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
 import com.google.common.base.Throwables;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -50,8 +51,8 @@ public class UnionValueOptionContext {
      */
     public UnionValueOptionContext(final Class<?> unionType, final Class<?> valueType, final Method getter,
             final Codec<Object, Object> codec) {
-        this.bindingType = Preconditions.checkNotNull(valueType);
-        this.codec = Preconditions.checkNotNull(codec);
+        this.bindingType = requireNonNull(valueType);
+        this.codec = requireNonNull(codec);
 
         try {
             this.getter = MethodHandles.publicLookup().unreflect(getter).asType(OBJECT_TYPE);
index fad47d78e2b655053a29de2af61d50704e5b3c36..db5bf5dc43d7622e5e8d62b2bc7ea93b0a0e17b7 100755 (executable)
@@ -8,6 +8,8 @@
 
 package org.opendaylight.mdsal.binding.javav2.dom.codec.impl.context.base;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableCollection;
@@ -39,9 +41,9 @@ public final class AnyxmlNodeCodecContext<D extends TreeNode> extends NodeCodecC
     AnyxmlNodeCodecContext(final DataSchemaNode schema, final Codec<Object, Object> codec, final Method getter,
                            final SchemaContext schemaContext) {
         this.yangIdentifier = new YangInstanceIdentifier.NodeIdentifier(schema.getQName());
-        this.valueCodec = Preconditions.checkNotNull(codec);
-        this.getter = Preconditions.checkNotNull(getter);
-        this.schema = Preconditions.checkNotNull(schema);
+        this.valueCodec = requireNonNull(codec);
+        this.getter = requireNonNull(getter);
+        this.schema = requireNonNull(schema);
     }
 
     @Override
index edcd894b8fc3742544f179e62bac914469624976..a3564d3d4f83b3f230196c0addde88ac5ec445c4 100644 (file)
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.mdsal.binding.javav2.dom.codec.impl.context.base;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
@@ -107,12 +109,12 @@ public final class BindingCodecContext implements CodecContextFactory, BindingTr
      *            - binding normalized node codec registry
      */
     public BindingCodecContext(final BindingRuntimeContext context, final BindingNormalizedNodeCodecRegistry registry) {
-        this.context = Preconditions.checkNotNull(context, "Binding Runtime Context is required.");
+        this.context = requireNonNull(context, "Binding Runtime Context is required.");
         this.root = SchemaRootCodecContext.create(this);
         this.identityCodec = new IdentityCodec(context);
         this.anyxmlCodec = new AnyxmlCodec(context);
         this.instanceIdentifierCodec = new InstanceIdentifierCodec(this);
-        this.registry = Preconditions.checkNotNull(registry);
+        this.registry = requireNonNull(registry);
     }
 
     @Override
index 1ab7a7f5211b2fec811faf0a4b5340ed0be1f259..f668c10bae40f5cac21675204cbec44f5554380a 100644 (file)
@@ -8,8 +8,9 @@
 
 package org.opendaylight.mdsal.binding.javav2.dom.codec.impl.context.base;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
 import com.google.common.collect.Iterables;
 import javax.annotation.Nonnull;
 import javax.annotation.concurrent.GuardedBy;
@@ -51,10 +52,10 @@ public final class DataContainerCodecPrototype<T> implements NodeContextSupplier
     @SuppressWarnings({"rawtypes", "unchecked"})
     private DataContainerCodecPrototype(final Class<?> cls, final YangInstanceIdentifier.PathArgument arg,
             final T nodeSchema, final CodecContextFactory factory) {
-        this.bindingClass = Preconditions.checkNotNull(cls);
-        this.yangArg = Preconditions.checkNotNull(arg);
-        this.schema = Preconditions.checkNotNull(nodeSchema);
-        this.factory = Preconditions.checkNotNull(factory);
+        this.bindingClass = requireNonNull(cls);
+        this.yangArg = requireNonNull(arg);
+        this.schema = requireNonNull(nodeSchema);
+        this.factory = requireNonNull(factory);
 
         this.bindingArg = new Item(bindingClass);
 
index 98b9729a8b80769561e21e639b98ebb7ed200c2c..ef7d8133d6ff9551db0b1d1ea7e58383cdf3d188 100644 (file)
@@ -8,6 +8,8 @@
 
 package org.opendaylight.mdsal.binding.javav2.dom.codec.impl.context.base;
 
+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;
@@ -54,8 +56,8 @@ class LazyTreeNode<D extends TreeNode> implements InvocationHandler, Augmentatio
 
     @SuppressWarnings({ "rawtypes", "unchecked" })
     LazyTreeNode(final TreeNodeCodecContext<D,?> ctx, final NormalizedNodeContainer data) {
-        this.context = Preconditions.checkNotNull(ctx, "Context must not be null");
-        this.data = Preconditions.checkNotNull(data, "Data must not be null");
+        this.context = requireNonNull(ctx, "Context must not be null");
+        this.data = requireNonNull(data, "Data must not be null");
     }
 
     @Override
@@ -188,7 +190,7 @@ class LazyTreeNode<D extends TreeNode> implements InvocationHandler, Augmentatio
         if (aug != null) {
             return aug.get(cls);
         }
-        Preconditions.checkNotNull(cls,"Supplied augmentation must not be null.");
+        requireNonNull(cls,"Supplied augmentation must not be null.");
 
         @SuppressWarnings({"unchecked","rawtypes"})
         final Optional<DataContainerCodecContext<?,?>> augCtx = context.possibleStreamChild((Class) cls);
index 3676ffe9d07a84c85f1fc2a11072502c0045e108..711cfe51554732ecde742c96664ac431862cdf74 100644 (file)
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.mdsal.binding.javav2.dom.codec.impl.context.base;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableCollection;
@@ -51,9 +53,9 @@ public final class LeafNodeCodecContext<D extends TreeNode> extends NodeCodecCon
     LeafNodeCodecContext(final DataSchemaNode schema, final Codec<Object, Object> codec, final Method getter,
             final SchemaContext schemaContext) {
         this.yangIdentifier = new YangInstanceIdentifier.NodeIdentifier(schema.getQName());
-        this.valueCodec = Preconditions.checkNotNull(codec);
-        this.getter = Preconditions.checkNotNull(getter);
-        this.schema = Preconditions.checkNotNull(schema);
+        this.valueCodec = requireNonNull(codec);
+        this.getter = requireNonNull(getter);
+        this.schema = requireNonNull(schema);
 
         this.defaultObject = createDefaultObject(schema, valueCodec, schemaContext);
     }
index e0e1749d34615423cfcd1f674c239dd28f00cd5a..4bf75e637fb45aa419b71cc70c9a040c87f2b09e 100644 (file)
@@ -8,8 +8,9 @@
 
 package org.opendaylight.mdsal.binding.javav2.dom.codec.impl.context.base;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
 import org.opendaylight.mdsal.binding.javav2.dom.codec.impl.MissingSchemaException;
 import org.opendaylight.mdsal.binding.javav2.runtime.context.BindingRuntimeContext;
 import org.opendaylight.mdsal.binding.javav2.spec.structural.Augmentation;
@@ -31,7 +32,7 @@ public final class MissingSchemaForClassException extends MissingSchemaException
 
     private MissingSchemaForClassException(final Class<?> clz) {
         super(String.format("Schema is not available for %s", clz));
-        this.bindingClass = Preconditions.checkNotNull(clz);
+        this.bindingClass = requireNonNull(clz);
     }
 
     static MissingSchemaForClassException forClass(final Class<?> clz) {
index 28eaba57a918bad385c64fe72ac3d18f70091c4e..d98e6b4a9881b3e48d2e58626523a114ddab4281 100644 (file)
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.mdsal.binding.javav2.dom.codec.impl.serializer;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
 import com.google.common.base.Preconditions;
 import java.io.IOException;
@@ -49,8 +51,8 @@ public final class BindingToNormalizedStreamWriter
 
     private BindingToNormalizedStreamWriter(final NodeCodecContext<?> rootNodeSchema,
             final NormalizedNodeStreamWriter delegate) {
-        this.rootNodeSchema = Preconditions.checkNotNull(rootNodeSchema);
-        this.delegate = Preconditions.checkNotNull(delegate);
+        this.rootNodeSchema = requireNonNull(rootNodeSchema);
+        this.delegate = requireNonNull(delegate);
     }
 
     /**
index d1dc638ccc09ae5c8b62b817f618e909c36bb35d..9605fa300f840dd1137274963bd0a27bbe362c31 100644 (file)
@@ -7,8 +7,9 @@
  */
 package org.opendaylight.mdsal.binding.javav2.dom.codec.impl.serializer;
 
+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.mdsal.binding.javav2.spec.base.Instantiable;
 import org.opendaylight.mdsal.binding.javav2.spec.base.Item;
@@ -33,7 +34,7 @@ public final class ChoiceDispatchSerializer implements TreeNodeSerializerImpleme
 
     @SuppressWarnings("rawtypes")
     private ChoiceDispatchSerializer(final Class choiceClass) {
-        this.choiceClass = Preconditions.checkNotNull(choiceClass);
+        this.choiceClass = requireNonNull(choiceClass);
     }
 
     /**
index c7fac4584f38384719021cf1820403cce190d50e..36b870c0e9cc4d19121660269a99e7b5a2a91d0d 100644 (file)
@@ -8,6 +8,8 @@
 
 package org.opendaylight.mdsal.binding.javav2.dom.codec.impl.value;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
@@ -46,7 +48,7 @@ final class BitsCodec extends ReflectionBasedCodec implements SchemaUnawareCodec
             final Map<String, Method> getters) {
 
         super(typeClass);
-        this.ctor = Preconditions.checkNotNull(ctor);
+        this.ctor = requireNonNull(ctor);
         this.ctorArgs = ImmutableSet.copyOf(ctorArgs);
         this.getters = ImmutableMap.copyOf(getters);
     }
index 431edbf126d8c7c5018e17a216f5ecc2dfcab50a..8dc0b0285501855a844d816938b9f5b07986da20 100644 (file)
@@ -8,8 +8,9 @@
 
 package org.opendaylight.mdsal.binding.javav2.dom.codec.impl.value;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
 import com.google.common.base.Throwables;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -38,9 +39,9 @@ public final class EncapsulatedValueCodec extends ReflectionBasedCodec implement
             final Class<?> valueType) {
 
         super(typeClz);
-        this.constructor = Preconditions.checkNotNull(constructor);
-        this.getter = Preconditions.checkNotNull(getter);
-        this.valueType = Preconditions.checkNotNull(valueType);
+        this.constructor = requireNonNull(constructor);
+        this.getter = requireNonNull(getter);
+        this.valueType = requireNonNull(valueType);
     }
 
     static Callable<EncapsulatedValueCodec> loader(final Class<?> typeClz, final TypeDefinition<?> typeDef) {
index 10da93cdda65f255c194545a17e1a04fad1c76ff..d9f1bc89aae15c8b07138a54ac52b514d22eb76b 100644 (file)
@@ -8,8 +8,9 @@
 
 package org.opendaylight.mdsal.binding.javav2.dom.codec.impl.value;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
 
 @Beta
 public abstract class ReflectionBasedCodec extends ValueTypeCodec {
@@ -17,7 +18,7 @@ public abstract class ReflectionBasedCodec extends ValueTypeCodec {
     private final Class<?> typeClass;
 
     protected ReflectionBasedCodec(final Class<?> typeClass) {
-        this.typeClass = Preconditions.checkNotNull(typeClass);
+        this.typeClass = requireNonNull(typeClass);
     }
 
     protected final Class<?> getTypeClass() {
index 39804fbb5760bbd8c0d4f3eec016978127535ded..6a127dfaa19f748ae5e8b3312e0d4ed68a2dc58d 100644 (file)
@@ -7,8 +7,9 @@
  */
 package org.opendaylight.mdsal.binding.javav2.dom.codec.modification;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -40,8 +41,8 @@ public final class LazyDataTreeModification<T extends TreeNode> implements DataT
     private final TreeNodeModification<T> rootNode;
 
     private LazyDataTreeModification(final DataTreeIdentifier<T> path, final TreeNodeModification<T> modification) {
-        this.path = Preconditions.checkNotNull(path);
-        this.rootNode = Preconditions.checkNotNull(modification);
+        this.path = requireNonNull(path);
+        this.rootNode = requireNonNull(modification);
     }
 
     @Nonnull
index 6b3761dda0519b52e2cc5d9a384a2de904dcd0fd..f22ba6f4f54d923be1c421b45cdb2a3d124e8f6e 100644 (file)
@@ -7,8 +7,9 @@
  */
 package org.opendaylight.mdsal.binding.javav2.dom.codec.modification;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
@@ -51,8 +52,8 @@ final class LazyTreeNodeModification<T extends TreeNode> implements TreeNodeModi
     private Collection<TreeNodeModification<? extends TreeNode>> childNodesCache;
 
     private LazyTreeNodeModification(final BindingTreeNodeCodec<T> codec, final DataTreeCandidateNode domData) {
-        this.codec = Preconditions.checkNotNull(codec);
-        this.domData = Preconditions.checkNotNull(domData);
+        this.codec = requireNonNull(codec);
+        this.domData = requireNonNull(domData);
         this.identifier = codec.deserializePathArgument(domData.getIdentifier());
     }
 
index beb9f5ab53fa6c8bc87b6eadcc7b8dc8eb289ccc..efd19c3b4364443c6ba21a3ce95b302f603c7c42 100644 (file)
@@ -8,6 +8,7 @@
 
 package org.opendaylight.mdsal.binding.javav2.generator.impl;
 
+import static java.util.Objects.requireNonNull;
 import static org.opendaylight.mdsal.binding.javav2.generator.impl.GenHelperUtil.processUsesImplements;
 
 import com.google.common.annotations.Beta;
@@ -178,7 +179,7 @@ final class AugmentToGenType {
 
     public static Module findAugmentTargetModule(final SchemaContext schemaContext,
             final AugmentationSchemaNode aug) {
-        Preconditions.checkNotNull(aug, "Augmentation schema can not be null.");
+        requireNonNull(aug, "Augmentation schema can not be null.");
         final QName first = aug.getTargetPath().getPathFromRoot().iterator().next();
         return schemaContext.findModule(first.getModule()).orElse(null);
     }
index cbb4bb2e02b31ae4a7453d81f5c014fb14856556..9b30a35957278029e4ac5b68fbfb2a9eb21f0a9e 100644 (file)
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.mdsal.binding.javav2.generator.impl;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
 import com.google.common.base.Preconditions;
 import java.util.ArrayList;
@@ -136,8 +138,8 @@ public class BindingGeneratorImpl implements BindingGenerator {
 
         final List<Type> filteredGenTypes = new ArrayList<>();
         for (final Module m : modules) {
-            final ModuleContext ctx = Preconditions.checkNotNull(this.genCtx.get(m),
-                    "Module context not found for module %s", m);
+            final ModuleContext ctx = requireNonNull(this.genCtx.get(m),
+                () -> "Module context not found for module " + m);
             filteredGenTypes.addAll(ctx.getGeneratedTypes());
             final Set<Type> additionalTypes = ((TypeProviderImpl) this.typeProvider).getAdditionalTypes().get(m);
             if (additionalTypes != null) {
index b65758a6cd0c799ef8fdafb40275a92b211b4c1b..9dc44c119e771ea18353175645f13916f17f376f 100755 (executable)
@@ -9,6 +9,7 @@
 package org.opendaylight.mdsal.binding.javav2.generator.impl;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.Objects.requireNonNull;
 import static org.opendaylight.mdsal.binding.javav2.generator.impl.AuxiliaryGenUtils.addTOToTypeBuilder;
 import static org.opendaylight.mdsal.binding.javav2.generator.impl.AuxiliaryGenUtils.annotateDeprecatedIfNecessary;
 import static org.opendaylight.mdsal.binding.javav2.generator.impl.AuxiliaryGenUtils.constructGetter;
@@ -299,14 +300,14 @@ final class GenHelperUtil {
                 if (superChildNode instanceof DataNodeContainer || superChildNode instanceof ChoiceSchemaNode) {
                     final QName childQName = createQNameFromSuperNode(module, node, superChildNode);
                     DataSchemaNode childNode = ((DataNodeContainer) node).getDataChildByName(childQName);
-                    Preconditions.checkNotNull(childNode, "%s->%s", node, childQName);
+                    requireNonNull(childNode, () -> node + "->" + childQName);
 
                     final GeneratedTypeBuilder type = genCtx.get(module).getChildNode(childNode.getPath());
                     final GeneratedTypeBuilder superType = genCtx.get(superModule).getChildNode(superChildNode
                             .getPath());
 
-                    Preconditions.checkNotNull(type, "%s->%s", module, childNode.getPath());
-                    Preconditions.checkNotNull(superType, "%s->%s", superModule, superChildNode.getPath());
+                    requireNonNull(type, () -> module + "->" + childNode.getPath());
+                    requireNonNull(superType, () -> superModule + "->" + superChildNode.getPath());
                     type.addImplementsType(superType);
                     if (superChildNode instanceof ListSchemaNode
                             && !((ListSchemaNode) superChildNode).getKeyDefinition().isEmpty()) {
@@ -326,12 +327,12 @@ final class GenHelperUtil {
             for (CaseSchemaNode superCaseNode : ((ChoiceSchemaNode) superNode).getCases().values()) {
                 final QName childQName = createQNameFromSuperNode(module, node, superCaseNode);
                 CaseSchemaNode caseNode = ((ChoiceSchemaNode) node).getCaseNodeByName(childQName);
-                Preconditions.checkNotNull(caseNode, "%s->%s", node, childQName);
+                requireNonNull(caseNode, () -> node + "->" + childQName);
 
                 final GeneratedTypeBuilder type = genCtx.get(module).getCase(caseNode.getPath());
                 final GeneratedTypeBuilder superType = genCtx.get(superModule).getCase(superCaseNode.getPath());
-                Preconditions.checkNotNull(type, "%s->%s", module, caseNode.getPath());
-                Preconditions.checkNotNull(superType, "%s->%s", superModule, superCaseNode.getPath());
+                requireNonNull(type, () -> module + "->" + caseNode.getPath());
+                requireNonNull(superType, () -> superModule + "->" + superCaseNode.getPath());
                 type.addImplementsType(superType);
                 addUsesImplements(superCaseNode, superModule, caseNode, module, schemaContext, genCtx, namespaceType);
             }
@@ -364,7 +365,7 @@ final class GenHelperUtil {
             }
         }
 
-        Preconditions.checkNotNull(groupingNode, "%s->%s", module, usesNode.getGroupingPath());
+        requireNonNull(groupingNode, () -> module + "->" + usesNode.getGroupingPath());
         Preconditions.checkState(groupingNode instanceof GroupingDefinition, "%s->%s", module,
                 usesNode.getGroupingPath());
         return (GroupingDefinition) groupingNode;
@@ -910,7 +911,7 @@ final class GenHelperUtil {
                         || typeDef instanceof UnionTypeDefinition || typeDef instanceof BitsTypeDefinition)) {
                     LeafSchemaNode originalLeaf = (LeafSchemaNode) ((DerivableSchemaNode) leaf).getOriginal()
                             .orElse(null);
-                    Preconditions.checkNotNull(originalLeaf);
+                    requireNonNull(originalLeaf);
                     returnType = genCtx.get(findParentModule(schemaContext, originalLeaf)).getInnerType(typeDef
                             .getPath());
                 } else {
@@ -1388,7 +1389,7 @@ final class GenHelperUtil {
                                                                   final IdentitySchemaNode identity, final Module
                                                                           module, final boolean verboseClassComments,
                                                                   final Map<Module, ModuleContext> genCtx) {
-        Preconditions.checkNotNull(identity, "Identity can not be null!");
+        requireNonNull(identity, "Identity can not be null!");
 
         //check first if identity has been resolved as base identity of some other one
         GeneratedTypeBuilder newType = findIdentityByQname(identity.getQName(), genCtx);
index edc5560cf5060fd3134d80b242fc99090189fd79..a1446fd2982609683aadee1e802a8499daf751e7 100755 (executable)
@@ -35,13 +35,10 @@ import static org.opendaylight.mdsal.binding.javav2.generator.util.Types.paramet
 
 import com.google.common.annotations.Beta;
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
-
 import java.util.Collection;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-
 import org.opendaylight.mdsal.binding.javav2.generator.context.ModuleContext;
 import org.opendaylight.mdsal.binding.javav2.generator.spi.TypeProvider;
 import org.opendaylight.mdsal.binding.javav2.generator.util.BindingTypes;
@@ -106,7 +103,7 @@ final class RpcActionGenHelper {
                                        final Map<String, Map<String, GeneratedTypeBuilder>> genTypeBuilders, final
                                        Map<Module, ModuleContext> genCtx,
                                        final TypeProvider typeProvider, final BindingNamespaceType namespaceType) {
-        Preconditions.checkNotNull(parent, "Parent should not be NULL.");
+        requireNonNull(parent, "Parent should not be NULL.");
         final Collection<DataSchemaNode> potentials = parent.getChildNodes();
         for (DataSchemaNode potential : potentials) {
             if (resolveDataSchemaNodesCheck(module, schemaContext, potential)) {
index d827fca3d6433a9cf8c851a33cb994601b997628..f90263ab1eaf84a26c5791c59359417a1f2334c2 100755 (executable)
@@ -8,6 +8,7 @@
 
 package org.opendaylight.mdsal.binding.javav2.generator.yang.types;
 
+import static java.util.Objects.requireNonNull;
 import static org.opendaylight.mdsal.binding.javav2.generator.util.BindingGeneratorUtil.encodeAngleBrackets;
 import static org.opendaylight.mdsal.binding.javav2.generator.yang.types.TypeProviderImpl.addUnitsToGenTO;
 import static org.opendaylight.yangtools.yang.model.util.SchemaContextUtil.findParentModule;
@@ -180,7 +181,7 @@ public final class TypeGenHelper {
     static GeneratedTransferObject wrapJavaTypeIntoTO(final String basePackageName, final TypeDefinition<?> typedef,
                                                       final Type javaType, final String moduleName, final
                                                       ModuleContext context) {
-        Preconditions.checkNotNull(javaType, "javaType cannot be null");
+        requireNonNull(javaType, "javaType cannot be null");
         final String propertyName = "value";
 
         final GeneratedTOBuilderImpl genTOBuilder = typedefToTransferObject(basePackageName, typedef, moduleName,
index 33b0b869568f86d3f0adb0fa4fe6f2e6851f05b4..e9662be608f836cd4b323ac085c755609d90e036 100755 (executable)
@@ -8,6 +8,7 @@
 
 package org.opendaylight.mdsal.binding.javav2.generator.yang.types;
 
+import static java.util.Objects.requireNonNull;
 import static org.opendaylight.mdsal.binding.javav2.generator.util.BindingGeneratorUtil.encodeAngleBrackets;
 import static org.opendaylight.mdsal.binding.javav2.generator.util.BindingGeneratorUtil.packageNameWithNamespacePrefix;
 import static org.opendaylight.mdsal.binding.javav2.generator.util.Types.getOuterClassPackageName;
@@ -345,9 +346,9 @@ public final class TypeProviderImpl implements TypeProvider {
     public List<GeneratedTOBuilder> provideGeneratedTOBuildersForUnionTypeDef(final String basePackageName,
             final UnionTypeDefinition typedef, final String typeDefName, final SchemaNode parentNode,
             final ModuleContext context) {
-        Preconditions.checkNotNull(basePackageName, "Base Package Name cannot be NULL!");
-        Preconditions.checkNotNull(typedef, "Type Definition cannot be NULL!");
-        Preconditions.checkNotNull(typedef.getQName(), "Type definition QName cannot be NULL!");
+        requireNonNull(basePackageName, "Base Package Name cannot be NULL!");
+        requireNonNull(typedef, "Type Definition cannot be NULL!");
+        requireNonNull(typedef.getQName(), "Type definition QName cannot be NULL!");
 
         final List<GeneratedTOBuilder> generatedTOBuilders = new ArrayList<>();
         final List<TypeDefinition<?>> unionTypes = typedef.getTypes();
index f12b04134536333afea6825cb3c3c86b9ea0c420..9186a7fd974785a93bdfb38484983694c8df515f 100644 (file)
@@ -8,8 +8,9 @@
 
 package org.opendaylight.mdsal.binding.javav2.generator.util;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
 import java.util.Objects;
 import org.opendaylight.mdsal.binding.javav2.generator.context.ModuleContext;
 import org.opendaylight.mdsal.binding.javav2.model.api.Type;
@@ -41,10 +42,10 @@ public abstract class AbstractBaseType implements Type {
      *            string with the name for this <code>Type</code>
      */
     protected AbstractBaseType(final String pkName, final String name, final ModuleContext context) {
-        Preconditions.checkNotNull(pkName, "Package Name for Generated Type cannot be null!");
-        Preconditions.checkNotNull(name, "Name of Generated Type cannot be null!");
+        requireNonNull(pkName, "Package Name for Generated Type cannot be null!");
+        requireNonNull(name, "Name of Generated Type cannot be null!");
         this.packageName = JavaIdentifierNormalizer.normalizeFullPackageName(pkName);
-        Preconditions.checkNotNull(context,
+        requireNonNull(context,
             "In case of not having identifiers normalized, ModuleContext instance must be provided.");
         this.name = JavaIdentifierNormalizer.normalizeClassIdentifier(pkName, name, context);
     }
@@ -63,14 +64,14 @@ public abstract class AbstractBaseType implements Type {
      */
     protected AbstractBaseType(final String pkName, final String name, final boolean isNormalized,
             final ModuleContext context) {
-        Preconditions.checkNotNull(pkName, "Package Name for Generated Type cannot be null!");
-        Preconditions.checkNotNull(name, "Name of Generated Type cannot be null!");
+        requireNonNull(pkName, "Package Name for Generated Type cannot be null!");
+        requireNonNull(name, "Name of Generated Type cannot be null!");
         if (isNormalized) {
             this.packageName = pkName;
             this.name = name;
         } else {
             this.packageName = JavaIdentifierNormalizer.normalizeFullPackageName(pkName);
-            Preconditions.checkNotNull(context,
+            requireNonNull(context,
                 "In case of not having identifiers normalized, ModuleContext instance must be provided.");
             this.name = JavaIdentifierNormalizer.normalizeClassIdentifier(pkName, name, context);
         }
@@ -78,8 +79,8 @@ public abstract class AbstractBaseType implements Type {
 
     protected AbstractBaseType(final String pkName, final String name, final boolean isPkNameNormalized,
             final boolean isTypeNormalized, final ModuleContext context) {
-        Preconditions.checkNotNull(pkName, "Package Name for Generated Type cannot be null!");
-        Preconditions.checkNotNull(name, "Name of Generated Type cannot be null!");
+        requireNonNull(pkName, "Package Name for Generated Type cannot be null!");
+        requireNonNull(name, "Name of Generated Type cannot be null!");
         if (isPkNameNormalized) {
             this.packageName = pkName;
         } else {
@@ -89,7 +90,7 @@ public abstract class AbstractBaseType implements Type {
         if (isTypeNormalized) {
             this.name = name;
         } else {
-            Preconditions.checkNotNull(context,
+            requireNonNull(context,
                 "In case of not having identifiers normalized ModuleContext instance must be provided.");
             this.name = JavaIdentifierNormalizer.normalizeClassIdentifier(pkName, name, context);
         }
index 33f9aa5742b647f435144841582cdc3d3443eb8f..ff58d6cffab95914051ea260e0405715c3a650d9 100644 (file)
@@ -8,9 +8,10 @@
 
 package org.opendaylight.mdsal.binding.javav2.generator.util;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
 import com.google.common.base.CharMatcher;
-import com.google.common.base.Preconditions;
 import com.google.common.base.Splitter;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
@@ -306,13 +307,13 @@ public final class Types {
          */
         private BaseTypeWithRestrictionsImpl(final String pkName, final String name, final Restrictions restrictions) {
             super(pkName, name, null);
-            this.restrictions = Preconditions.checkNotNull(restrictions);
+            this.restrictions = requireNonNull(restrictions);
         }
 
         private BaseTypeWithRestrictionsImpl(final String pkName, final String name, final Restrictions restrictions,
                                              final ModuleContext moduleContext) {
             super(pkName, name, moduleContext);
-            this.restrictions = Preconditions.checkNotNull(restrictions);
+            this.restrictions = requireNonNull(restrictions);
         }
 
         @Override
@@ -398,8 +399,8 @@ public final class Types {
         private final RangeConstraint<T> rangeConstraint;
 
         private DefaultRestrictions(final T min, final T max) {
-            Preconditions.checkNotNull(min);
-            Preconditions.checkNotNull(max);
+            requireNonNull(min);
+            requireNonNull(max);
             this.rangeConstraint = new RangeConstraint<T>() {
 
                 @Override
index 7d7dfe46ff75cecd63f62eef949a6c3297b7098a..fd3da8fbac3c7b2d95cb5cb38d830684240002c9 100755 (executable)
@@ -8,6 +8,8 @@
 
 package org.opendaylight.mdsal.binding.javav2.generator.util.generated.type.builder;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
@@ -128,7 +130,7 @@ abstract class AbstractGeneratedTypeBuilder<T extends GeneratedTypeBuilderBase<T
 
     @Override
     public T addComment(final TypeComment typeComment) {
-        this.comment = Preconditions.checkNotNull(typeComment);
+        this.comment = requireNonNull(typeComment);
         return thisInstance();
     }
 
@@ -262,7 +264,7 @@ abstract class AbstractGeneratedTypeBuilder<T extends GeneratedTypeBuilderBase<T
 
     @Override
     public void setYangSourceDefinition(final YangSourceDefinition definition) {
-        yangSourceDefinition = Preconditions.checkNotNull(definition);
+        yangSourceDefinition = requireNonNull(definition);
     }
 
     @Override
index 7b7e7b44c99d29723d882bd0ca582901651ffebd..48900090a337c1065d210c69ef3b347da57047dc 100644 (file)
@@ -8,6 +8,8 @@
 
 package org.opendaylight.mdsal.binding.javav2.java.api.generator;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Splitter;
@@ -69,8 +71,8 @@ public final class GeneratorJavaFile {
      *            set of types for which JAVA code should be generated
      */
     public GeneratorJavaFile(final BuildContext buildContext, final Collection<? extends Type> types) {
-        this.buildContext = Preconditions.checkNotNull(buildContext);
-        this.types = Preconditions.checkNotNull(types);
+        this.buildContext = requireNonNull(buildContext);
+        this.types = requireNonNull(types);
         this.generators.add(new EnumGenerator());
         this.generators.add(new InterfaceGenerator());
         this.generators.add(new BuilderGenerator());
index 3779f4a04f8ab1828a19c3409176ba1413898bbe..15120b42fd40a0c392449be2f09dfddfa7a5fb4b 100644 (file)
@@ -7,7 +7,8 @@
  */
 package org.opendaylight.mdsal.binding.javav2.java.api.generator.range_generators;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.collect.Range;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -26,9 +27,9 @@ abstract class AbstractPrimitiveRangeGenerator<T extends Number & Comparable<T>>
     protected AbstractPrimitiveRangeGenerator(final Class<T> typeClass, final String primitiveName, final T minValue,
             final T maxValue) {
         super(typeClass);
-        this.primitiveName = Preconditions.checkNotNull(primitiveName);
-        this.minValue = Preconditions.checkNotNull(minValue);
-        this.maxValue = Preconditions.checkNotNull(maxValue);
+        this.primitiveName = requireNonNull(primitiveName);
+        this.minValue = requireNonNull(minValue);
+        this.maxValue = requireNonNull(maxValue);
     }
 
     /**
index b524a9bcc75bd305016b5527f47b8fd732f13e61..007e39b86838b74ffaf1f55cc112fd7aeb679908 100644 (file)
@@ -7,7 +7,8 @@
  */
 package org.opendaylight.mdsal.binding.javav2.java.api.generator.range_generators;
 
-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 java.util.Map;
@@ -45,7 +46,7 @@ public abstract class AbstractRangeGenerator<T extends Number & Comparable<T>> {
     private final Class<T> type;
 
     protected AbstractRangeGenerator(final Class<T> typeClass) {
-        this.type = Preconditions.checkNotNull(typeClass);
+        this.type = requireNonNull(typeClass);
     }
 
     public static AbstractRangeGenerator<?> forType(@Nonnull final Type type) {
index c7b66e927df363d5e4f624d7191ada94adffae3c..e81dd9d84a78a4cf6377714cbea1db8eb5a74c27 100644 (file)
@@ -9,8 +9,8 @@
 package org.opendaylight.mdsal.binding.javav2.java.api.generator.renderers;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.Objects.requireNonNull;
 
-import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
 
 import java.util.Collection;
@@ -44,7 +44,7 @@ public abstract class BaseRenderer {
     private final Map<String, String> importedNames = new HashMap<>();
 
     protected BaseRenderer(final GeneratedType type) {
-        this.genType = Preconditions.checkNotNull(type);
+        this.genType = requireNonNull(type);
         this.importMap = new HashMap<>();
     }
 
@@ -167,9 +167,9 @@ public abstract class BaseRenderer {
         checkArgument(parentGenType.getPackageName() != null,
                 "Parent Generated Type cannot have Package Name referenced as NULL!");
 
-        final String typeName = Preconditions.checkNotNull(type.getName());
-        final String typePackageName = Preconditions.checkNotNull(type.getPackageName());
-        final String parentTypeName = Preconditions.checkNotNull(parentGenType.getName());
+        final String typeName = requireNonNull(type.getName());
+        final String typePackageName = requireNonNull(type.getPackageName());
+        final String parentTypeName = requireNonNull(parentGenType.getName());
         if (typeName.equals(parentTypeName) || typePackageName.startsWith("java.lang") || typePackageName.isEmpty()) {
             return;
         }
@@ -199,8 +199,8 @@ public abstract class BaseRenderer {
         checkArgument(type != null, "Type parameter MUST be specified and cannot be NULL!");
         checkArgument(importMap != null, "Imports Map cannot be NULL!");
 
-        final String typePackageName = Preconditions.checkNotNull(type.getPackageName());
-        final String typeName = Preconditions.checkNotNull(type.getName());
+        final String typePackageName = requireNonNull(type.getPackageName());
+        final String typeName = requireNonNull(type.getName());
         final String importedPackageName = importMap.get(typeName);
         final StringBuilder sb;
         if (typePackageName.equals(importedPackageName)) {
@@ -325,7 +325,7 @@ public abstract class BaseRenderer {
     protected String getterMethod(final GeneratedProperty field) {
         final StringBuilder sb = new StringBuilder();
         final String name = TextTemplateUtil.fieldName(field);
-        final String importedName = Preconditions.checkNotNull(importedName(field.getReturnType()));
+        final String importedName = requireNonNull(importedName(field.getReturnType()));
         sb.append("public ")
                 .append(importedName)
                 .append(' ')
index d727dbffbda701dc404c1b9e39bff0ded48a7349..962955900d3095f783de7e374c2bc7b62234b745 100644 (file)
@@ -8,6 +8,7 @@
 
 package org.opendaylight.mdsal.binding.javav2.java.api.generator.renderers;
 
+import static java.util.Objects.requireNonNull;
 import static org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.fieldName;
 import static org.opendaylight.mdsal.binding.javav2.java.api.generator.util.TextTemplateUtil.setterMethod;
 
@@ -83,7 +84,7 @@ public class ClassRenderer extends BaseRenderer {
 
         if (restrictions != null && restrictions.getRangeConstraint().isPresent()) {
             rangeGenerator = AbstractRangeGenerator.forType(findProperty(genType, "value").getReturnType());
-            Preconditions.checkNotNull(rangeGenerator);
+            requireNonNull(rangeGenerator);
         } else {
             rangeGenerator = null;
         }
index 369e2bf66055998d3c1b9314d2d31a361bea0962..6ac8d53cb157011924fbb112d3ccd18a4f3b6fd0 100755 (executable)
@@ -8,7 +8,8 @@
 
 package org.opendaylight.mdsal.binding.javav2.java.api.generator.renderers;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import java.util.AbstractMap.SimpleEntry;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -45,7 +46,7 @@ public class InterfaceRenderer extends BaseRenderer {
      */
     public InterfaceRenderer(final GeneratedType type) {
         super(type);
-        Preconditions.checkNotNull(type, "Generated type reference cannot be NULL!");
+        requireNonNull(type, "Generated type reference cannot be NULL!");
     }
 
     @Override
index 4d42e3130c87d7d0dba27cca1185fc50374610e3..890c440780a6bf8a6fc01fee820e94aa18bf568f 100644 (file)
@@ -7,6 +7,7 @@
  */
 package org.opendaylight.mdsal.binding.javav2.java.api.generator.renderers;
 
+import static java.util.Objects.requireNonNull;
 import static org.opendaylight.mdsal.binding.javav2.generator.util.Types.BOOLEAN;
 
 import com.google.common.base.Preconditions;
@@ -188,7 +189,7 @@ public class UnionRenderer extends ClassRenderer {
 
         final StringBuilder sb1 = new StringBuilder();
         final String name = TextTemplateUtil.fieldName(field);
-        final String importedName = Preconditions.checkNotNull(importedName(field.getReturnType()));
+        final String importedName = requireNonNull(importedName(field.getReturnType()));
         sb1.append("public ")
                 .append(importedName)
                 .append(' ')
index f825bba6593fbbc80c4bb68166440b9aa4d96a3e..fe357898d25281d0e12e171bfad0e26a4e40e9f2 100755 (executable)
@@ -8,6 +8,8 @@
 
 package org.opendaylight.mdsal.binding.javav2.java.api.generator.util;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.base.CharMatcher;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Splitter;
@@ -381,7 +383,7 @@ public final class TextTemplateUtil {
      * @return underscored string form
      */
     public static String fieldName(final GeneratedProperty property) {
-        final String name = Preconditions.checkNotNull(property.getName());
+        final String name = requireNonNull(property.getName());
         return UNDERSCORE.concat(name);
     }
 
@@ -402,8 +404,8 @@ public final class TextTemplateUtil {
      * @return getter for property
      */
     public static String getterMethodName(final GeneratedProperty field) {
-        final Type type = Preconditions.checkNotNull(field.getReturnType());
-        final String name = Preconditions.checkNotNull(field.getName());
+        final Type type = requireNonNull(field.getReturnType());
+        final String name = requireNonNull(field.getName());
         final String prefix = Types.BOOLEAN.equals(type) ? "is" : "get";
         return prefix.concat(toFirstUpper(name));
     }
@@ -458,7 +460,7 @@ public final class TextTemplateUtil {
      * @return getter name without prefix
      */
     public static String propertyNameFromGetter(final MethodSignature getter) {
-        final String name = Preconditions.checkNotNull(getter.getName());
+        final String name = requireNonNull(getter.getName());
         int prefix;
         if (name.startsWith("is")) {
             prefix = 2;
index c81c5c74fe8dd83f0ddd9d2fe9f856860520d6f7..937fa9dd003cc8ac2ea98391cbb3a67e5ae52792 100644 (file)
@@ -8,12 +8,12 @@
 
 package org.opendaylight.mdsal.binding.javav2.maven.api.gen.plugin;
 
+import static java.util.Objects.requireNonNull;
 import static org.opendaylight.mdsal.binding.javav2.generator.util.JavaIdentifierNormalizer.normalizeFullPackageName;
 import static org.opendaylight.mdsal.binding.javav2.util.BindingMapping.getRootPackageName;
 
 import com.google.common.annotations.Beta;
 import com.google.common.base.Joiner;
-import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSet.Builder;
 import java.io.BufferedWriter;
@@ -106,7 +106,7 @@ public final class CodeGeneratorImpl implements BasicCodeGenerator, BuildContext
 
     @Override
     public void setBuildContext(BuildContext buildContext) {
-        this.buildContext = Preconditions.checkNotNull(buildContext);
+        this.buildContext = requireNonNull(buildContext);
     }
 
     @Override
index e89f921d83252e8607110b9e557c9261369eacd9..8d43e29c30713505e7253dfa8b6638bbebada830 100755 (executable)
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.mdsal.binding.javav2.runtime.context;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
 import com.google.common.base.Preconditions;
 import com.google.common.cache.CacheBuilder;
@@ -346,10 +348,10 @@ public class BindingRuntimeContext implements Immutable {
 
     private Entry<GeneratedType, Object> getTypeWithSchema(final Type referencedType) {
         final Object schema = this.typeToDefiningSchema.get(referencedType);
-        Preconditions.checkNotNull(schema, "Failed to find schema for type %s", referencedType);
+        requireNonNull(schema, () -> "Failed to find schema for type " + referencedType);
 
         final Type definedType = this.typeToDefiningSchema.inverse().get(schema);
-        Preconditions.checkNotNull(definedType, "Failed to find defined type for %s schema %s", referencedType, schema);
+        requireNonNull(definedType, () -> "Failed to find defined type for " + referencedType + " schema " + schema);
 
         if (definedType instanceof GeneratedTypeBuilder) {
             return new SimpleEntry<>(((GeneratedTypeBuilder) definedType).toInstance(), schema);
index f2b0483f47d6e05ce013dfebea15caf9ca43d0ac..41bfd6a05f9d0283901522807ae0cbff07b640f4 100644 (file)
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.mdsal.binding.javav2.runtime.javassist;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
 import com.google.common.base.Preconditions;
 import java.util.Collection;
@@ -39,7 +41,7 @@ public final class JavassistUtils {
     private final ClassPool classPool;
 
     private JavassistUtils(final ClassPool pool) {
-        classPool = Preconditions.checkNotNull(pool);
+        classPool = requireNonNull(pool);
     }
 
     /**
@@ -52,7 +54,7 @@ public final class JavassistUtils {
      * @return shared utility instance for specified pool
      */
     public static synchronized JavassistUtils forClassPool(final ClassPool pool) {
-        JavassistUtils ret = INSTANCES.get(Preconditions.checkNotNull(pool));
+        JavassistUtils ret = INSTANCES.get(requireNonNull(pool));
         if (ret == null) {
             ret = new JavassistUtils(pool);
             INSTANCES.put(pool, ret);
index 77fbff5722da12ca81c0cb2e730d85f32f06b0d3..008d741d614a2c68787fcd971536d179f8fa6ae1 100644 (file)
@@ -8,8 +8,9 @@
 
 package org.opendaylight.mdsal.binding.javav2.runtime.reflection;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
@@ -97,7 +98,7 @@ abstract class AugmentationFieldGetter {
         private final MethodHandle fieldGetter;
 
         ReflectionAugmentationFieldGetter(final MethodHandle mh) {
-            this.fieldGetter = Preconditions.checkNotNull(mh);
+            this.fieldGetter = requireNonNull(mh);
         }
 
         @Override
index 038adb0ce952968c9c05f36e92b52051dc2abf2b..9928032175109d31417d12a69c989c3b8b0cc57f 100644 (file)
@@ -8,8 +8,9 @@
 
 package org.opendaylight.mdsal.binding.javav2.spec.base;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
 
 /**
  * An IdentifiableItem represents a object that is usually present in a collection and can be
@@ -24,8 +25,8 @@ public final class IdentifiableItem<I extends TreeNode, T> extends TreeArgument<
     private final T key;
 
     public IdentifiableItem(final Class<I> type, final T key) {
-        this.type = Preconditions.checkNotNull(type);
-        this.key = Preconditions.checkNotNull(key, "Key may not be null.");
+        this.type = requireNonNull(type);
+        this.key = requireNonNull(key, "Key may not be null.");
     }
 
     @Override
index 60e2faaf93d5b340ddc43b4714eea099c8fff27a..b0fe028e51f1eb7b00087fe5e811892358baee59 100644 (file)
@@ -8,6 +8,8 @@
 
 package org.opendaylight.mdsal.binding.javav2.spec.base;
 
+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;
@@ -89,8 +91,8 @@ public class InstanceIdentifier<T extends TreeNode> implements Path<InstanceIden
     }
 
     InstanceIdentifier(final Class<T> type, final Iterable<TreeArgument> pathArguments, final boolean wildcarded, final int hash) {
-        this.pathArguments = Preconditions.checkNotNull(pathArguments);
-        this.targetType = Preconditions.checkNotNull(type);
+        this.pathArguments = requireNonNull(pathArguments);
+        this.targetType = requireNonNull(type);
         this.wildcarded = wildcarded;
         this.hash = hash;
     }
@@ -289,7 +291,7 @@ public class InstanceIdentifier<T extends TreeNode> implements Path<InstanceIden
      */
     @Override
     public final boolean contains(final InstanceIdentifier<? extends TreeNode> other) {
-        Preconditions.checkNotNull(other, "other should not be null");
+        requireNonNull(other, "other should not be null");
 
         final Iterator<?> lit = pathArguments.iterator();
         final Iterator<?> oit = other.pathArguments.iterator();
@@ -316,7 +318,7 @@ public class InstanceIdentifier<T extends TreeNode> implements Path<InstanceIden
      * @return true if this identifier contains the other object
      */
     public final boolean containsWildcarded(final InstanceIdentifier<?> other) {
-        Preconditions.checkNotNull(other, "other should not be null");
+        requireNonNull(other, "other should not be null");
 
         final Iterator<TreeArgument> lit = pathArguments.iterator();
         final Iterator<TreeArgument> oit = other.pathArguments.iterator();
@@ -441,7 +443,7 @@ public class InstanceIdentifier<T extends TreeNode> implements Path<InstanceIden
      *         contains a null element.
      */
     private static InstanceIdentifier<?> internalCreate(final Iterable<TreeArgument> pathArguments) {
-        final Iterator<? extends TreeArgument> it = Preconditions.checkNotNull(pathArguments, "pathArguments may not be null").iterator();
+        final Iterator<? extends TreeArgument> it = requireNonNull(pathArguments, "pathArguments may not be null").iterator();
         final HashCodeBuilder<TreeArgument> hashBuilder = new HashCodeBuilder<>();
         boolean wildcard = false;
         TreeArgument a = null;
@@ -514,7 +516,7 @@ public class InstanceIdentifier<T extends TreeNode> implements Path<InstanceIden
 
     public static <N extends TreeNode, K> K keyOf(
             final InstanceIdentifier<N> id) {
-        Preconditions.checkNotNull(id);
+        requireNonNull(id);
         Preconditions.checkArgument(id instanceof KeyedInstanceIdentifier, "%s does not have a key", id);
 
         @SuppressWarnings("unchecked")
index eb1e079b750febad2bb55ee52bb8ed4f258b47dc..1e0a12f52742c4727ed9507afeebe4b5781964e6 100644 (file)
@@ -8,8 +8,9 @@
 
 package org.opendaylight.mdsal.binding.javav2.spec.base;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
 
 /**
  * An Item represents an object that probably is only one of it's kind. For example a Nodes object
@@ -23,7 +24,7 @@ public final class Item<T extends TreeNode> extends TreeArgument<T> {
     private final Class<T> type;
 
     public Item(final Class<T> type) {
-        this.type = Preconditions.checkNotNull(type);
+        this.type = requireNonNull(type);
     }
 
     @Override
index 4ca7c6a29df618ee8ada71329b0eac646d4b66fd..6ed5cbd8bb3d8120d04497121fbac32ff5d8ccf9 100755 (executable)
@@ -8,8 +8,9 @@
 
 package org.opendaylight.mdsal.binding.javav2.spec.runtime;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
 
 /**
  * Binding Namespace is structure of Java packages designed to prevent conflicts in YANG Java
@@ -29,7 +30,7 @@ public enum BindingNamespaceType {
     private final String packagePrefix;
 
     BindingNamespaceType(String packagePrefix) {
-        this.packagePrefix = Preconditions.checkNotNull(packagePrefix);
+        this.packagePrefix = requireNonNull(packagePrefix);
     }
 
     public String getPackagePrefix() {
index 3d450a6e23ee3b373e567f86fb7793c6aab4fa2f..76650c03fdc018a590b59799ced40f1e2032a82e 100644 (file)
@@ -8,8 +8,9 @@
 
 package org.opendaylight.mdsal.binding.javav2.util;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
 import com.google.common.base.Throwables;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
@@ -46,9 +47,9 @@ public final class StringValueObjectFactory<T> {
     private final T template;
 
     private StringValueObjectFactory(final T template, final MethodHandle constructor, final MethodHandle setter) {
-        this.template = Preconditions.checkNotNull(template);
+        this.template = requireNonNull(template);
         this.constructor = constructor.bindTo(template);
-        this.setter = Preconditions.checkNotNull(setter);
+        this.setter = requireNonNull(setter);
     }
 
     public static <T> StringValueObjectFactory<T> create(final Class<T> clazz, final String templateString) {
@@ -116,7 +117,7 @@ public final class StringValueObjectFactory<T> {
     }
 
     public T newInstance(final String string) {
-        Preconditions.checkNotNull(string, "Argument may not be null");
+        requireNonNull(string, "Argument may not be null");
 
         try {
             final T ret = (T) constructor.invokeExact();
index dca4a1de7ff160dd6876fd39810fd90e1765a3d9..914164d62d3992604978e730156832a71a291053 100644 (file)
@@ -7,9 +7,10 @@
  */
 package org.opendaylight.mdsal.dom.broker;
 
+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.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMap.Builder;
@@ -44,7 +45,7 @@ abstract class AbstractDOMRoutingTable<I, D, M, L extends EventListener,
 
     AbstractDOMRoutingTable(final Map<SchemaPath, E> operations,
             final SchemaContext schemaContext) {
-        this.operations = Preconditions.checkNotNull(operations);
+        this.operations = requireNonNull(operations);
         this.schemaContext = schemaContext;
     }
 
index 89cd70de5fb0690aa9deac4f8a591c84a332fe61..f227b122fdb81f5cc67efebcf3a06c6af067aff3 100644 (file)
@@ -7,9 +7,10 @@
  */
 package org.opendaylight.mdsal.dom.broker;
 
+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.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMap.Builder;
 import java.util.ArrayList;
@@ -33,8 +34,8 @@ abstract class AbstractDOMRoutingTableEntry<D, M, L extends EventListener> {
     private final SchemaPath type;
 
     AbstractDOMRoutingTableEntry(final SchemaPath type, final Map<D, List<M>> implementations) {
-        this.type = Preconditions.checkNotNull(type);
-        this.implementations = Preconditions.checkNotNull(implementations);
+        this.type = requireNonNull(type);
+        this.implementations = requireNonNull(implementations);
     }
 
     SchemaPath getType() {
index 527f19a93562ee057ce76a45e70eaea086ec2f1a..a4fab0c762f342c3dc0bd43495f1a981c42d62b0 100644 (file)
@@ -7,7 +7,8 @@
  */
 package org.opendaylight.mdsal.dom.broker;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.collect.Maps;
 import java.util.Comparator;
 import java.util.List;
@@ -25,7 +26,7 @@ abstract class AbstractDOMRpcRoutingTableEntry extends AbstractDOMRoutingTableEn
     AbstractDOMRpcRoutingTableEntry(final DOMRpcIdentifier rpcId, final Map<YangInstanceIdentifier,
         List<DOMRpcImplementation>> implementations) {
         super(rpcId.getType(), implementations);
-        this.rpcId = Preconditions.checkNotNull(rpcId);
+        this.rpcId = requireNonNull(rpcId);
     }
 
     final DOMRpcIdentifier getRpcId() {
index 262b0b35dd9175fe02676a78f3b2db72aab721c6..64ebada7946b89176670df67bb8eb6f8a53640fc 100644 (file)
@@ -7,7 +7,8 @@
  */
 package org.opendaylight.mdsal.dom.broker;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.base.Throwables;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -41,8 +42,8 @@ final class CommitCoordinationTask implements Callable<CommitInfo> {
     CommitCoordinationTask(final DOMDataTreeWriteTransaction transaction,
             final Collection<DOMStoreThreePhaseCommitCohort> cohorts,
             final DurationStatisticsTracker commitStatTracker) {
-        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;
     }
 
index 2ae90b997f57bbaa66e9cd00e0ce1c5c7d38e16c..2421061081f269ea24e62ba107030a750dd8ea60 100644 (file)
@@ -8,6 +8,8 @@
 
 package org.opendaylight.mdsal.dom.broker;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.FluentFuture;
 import com.google.common.util.concurrent.FutureCallback;
@@ -76,8 +78,8 @@ final class DOMDataBrokerTransactionChainImpl extends AbstractDOMForwardedTransa
             final AbstractDOMDataBroker broker, final DOMTransactionChainListener 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() {
index f0d002cbe0e3dff867d9a63beb71e460c181805c..608b71d46dbe38976d5edc8a4a400104802f1e35 100644 (file)
@@ -7,8 +7,9 @@
  */
 package org.opendaylight.mdsal.dom.broker;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeShard;
 import org.opendaylight.yangtools.concepts.AbstractListenerRegistration;
@@ -21,8 +22,8 @@ public final class DOMDataTreeShardRegistration<T extends DOMDataTreeShard> exte
     public DOMDataTreeShardRegistration(final ShardedDOMDataTree tree, final DOMDataTreeIdentifier prefix,
             final T shard) {
         super(shard);
-        this.tree = Preconditions.checkNotNull(tree);
-        this.prefix = Preconditions.checkNotNull(prefix);
+        this.tree = requireNonNull(tree);
+        this.prefix = requireNonNull(prefix);
     }
 
     public DOMDataTreeIdentifier getPrefix() {
index ea79cae321a0842cee33c14410fd09778876598f..6eafd0696fc126235f48c9960f133db865992452 100644 (file)
@@ -7,7 +7,8 @@
  */
 package org.opendaylight.mdsal.dom.broker;
 
-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;
@@ -34,8 +35,8 @@ final class DOMNotificationRouterEvent {
     @SuppressWarnings("checkstyle:hiddenField")
     ListenableFuture<Void> initialize(final DOMNotification notification,
             final Collection<ListenerRegistration<? extends DOMNotificationListener>> 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;
     }
index 2f62c7bde08fe1a684279eb2eb6097d95bce4730..4053475ccbb4066d509634df7989cf35779296ce 100644 (file)
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.mdsal.dom.broker;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.FluentFuture;
 import com.google.common.util.concurrent.ListeningExecutorService;
@@ -53,7 +55,7 @@ public class SerializedDOMDataBroker extends AbstractDOMDataBroker {
     public SerializedDOMDataBroker(final Map<LogicalDatastoreType, DOMStore> 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() {
index f377c9322fd23e78e39002ba3e68e294bde86095..d02e27cfb4a240942a720e95d0218be4bb18c12b 100644 (file)
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.mdsal.dom.broker;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.base.Preconditions;
 import com.google.common.base.Verify;
 import com.google.common.collect.ImmutableSet;
@@ -58,7 +60,7 @@ class ShardedDOMDataTreeProducer implements DOMDataTreeProducer {
     ShardedDOMDataTreeProducer(final ShardedDOMDataTree dataTree,
                                final Collection<DOMDataTreeIdentifier> subtrees,
                                final Map<DOMDataTreeIdentifier, DOMDataTreeShard> shardMap) {
-        this.dataTree = Preconditions.checkNotNull(dataTree);
+        this.dataTree = requireNonNull(dataTree);
         this.subtrees = ImmutableSet.copyOf(subtrees);
         this.layout = ProducerLayout.create(shardMap);
     }
@@ -274,6 +276,6 @@ class ShardedDOMDataTreeProducer implements DOMDataTreeProducer {
     void bindToListener(final DOMDataTreeListener listener) {
         final DOMDataTreeListener local = attachedListener;
         Preconditions.checkState(local == null, "Producer %s is already attached to listener %s", this, local);
-        this.attachedListener = Preconditions.checkNotNull(listener);
+        this.attachedListener = requireNonNull(listener);
     }
 }
index a365290db1acd1d159176facfd49fefff160ce50..28b91dc141b42a09b57c041d7529e535117c15ae 100644 (file)
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.mdsal.dom.broker;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.util.concurrent.FluentFuture;
@@ -56,9 +58,9 @@ final class ShardedDOMDataTreeWriteTransaction implements DOMDataTreeCursorAware
 
     ShardedDOMDataTreeWriteTransaction(final ShardedDOMDataTreeProducer producer,
         final Map<DOMDataTreeIdentifier, DOMDataTreeShardWriteTransaction> transactions, final ProducerLayout layout) {
-        this.producer = Preconditions.checkNotNull(producer);
+        this.producer = requireNonNull(producer);
         this.transactions = ImmutableMap.copyOf(transactions);
-        this.layout = Preconditions.checkNotNull(layout);
+        this.layout = requireNonNull(layout);
         this.identifier = "SHARDED-DOM-" + COUNTER.getAndIncrement();
         LOG.debug("Created new transaction {}", identifier);
     }
@@ -179,8 +181,8 @@ final class ShardedDOMDataTreeWriteTransaction implements DOMDataTreeCursorAware
         private final DOMDataTreeIdentifier rootPosition;
 
         DelegatingCursor(final DOMDataTreeWriteCursor delegate, final DOMDataTreeIdentifier rootPosition) {
-            this.delegate = Preconditions.checkNotNull(delegate);
-            this.rootPosition = Preconditions.checkNotNull(rootPosition);
+            this.delegate = requireNonNull(delegate);
+            this.rootPosition = requireNonNull(rootPosition);
             currentArgs.addAll(rootPosition.getRootIdentifier().getPathArguments());
         }
 
index 30b7e5ce81620e47e2abbcef51c930b52488ac2f..435067bccbe2c192a12780afbce0cea08a3485b8 100644 (file)
@@ -7,7 +7,8 @@
  */
 package org.opendaylight.mdsal.dom.broker;
 
-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.FutureCallback;
 import com.google.common.util.concurrent.MoreExecutors;
@@ -26,9 +27,9 @@ public class TransactionChainWriteTransaction implements DOMDataTreeWriteTransac
 
     public TransactionChainWriteTransaction(final Object identifier, final DOMDataTreeWriteTransaction delegateTx,
                                             final ShardedDOMTransactionChainAdapter txChain) {
-        this.delegateTx = Preconditions.checkNotNull(delegateTx);
-        this.identifier = Preconditions.checkNotNull(identifier);
-        this.txChain = Preconditions.checkNotNull(txChain);
+        this.delegateTx = requireNonNull(delegateTx);
+        this.identifier = requireNonNull(identifier);
+        this.txChain = requireNonNull(txChain);
     }
 
 
index a81ee295cb4138109e2b9c96399e6a7d1cd0b5a4..2f83695e200e3aacbbaf14dcbdf461f447906fc5 100644 (file)
@@ -7,7 +7,8 @@
  */
 package org.opendaylight.mdsal.dom.store.inmemory;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.util.concurrent.ListenableFuture;
 import org.opendaylight.mdsal.dom.spi.store.SnapshotBackedWriteTransaction;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification;
@@ -21,7 +22,7 @@ final class ChainedTransactionCommitImpl extends InMemoryDOMStoreThreePhaseCommi
                                  final DOMStoreTransactionChainImpl txChain,
                                  final Exception operationError) {
         super(store, transaction, modification, operationError);
-        this.txChain = Preconditions.checkNotNull(txChain);
+        this.txChain = requireNonNull(txChain);
     }
 
     @Override
index 0018d0eb90e70dca8c449194c7c6f23bb3697b29..6f512e202402c30fd5e4162a4b089282ca07081d 100644 (file)
@@ -7,7 +7,8 @@
  */
 package org.opendaylight.mdsal.dom.store.inmemory;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import org.opendaylight.mdsal.dom.spi.store.AbstractSnapshotBackedTransactionChain;
 import org.opendaylight.mdsal.dom.spi.store.DOMStoreThreePhaseCommitCohort;
 import org.opendaylight.mdsal.dom.spi.store.SnapshotBackedWriteTransaction;
@@ -18,7 +19,7 @@ final class DOMStoreTransactionChainImpl extends AbstractSnapshotBackedTransacti
     private final InMemoryDOMDataStore store;
 
     DOMStoreTransactionChainImpl(final InMemoryDOMDataStore store) {
-        this.store = Preconditions.checkNotNull(store);
+        this.store = requireNonNull(store);
     }
 
     @Override
index dbd6cadacd6c71af22bc31f3120ac4b8ff9bac13..5c6b55fb195f9cd61587a799fece25edb7aefffc 100644 (file)
@@ -7,7 +7,8 @@
  */
 package org.opendaylight.mdsal.dom.store.inmemory;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.collect.ForwardingObject;
 import java.util.Optional;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteCursor;
@@ -20,7 +21,7 @@ final class DataTreeModificationCursorAdaptor extends ForwardingObject implement
     private final DataTreeModificationCursor delegate;
 
     private DataTreeModificationCursorAdaptor(final DataTreeModificationCursor delegate) {
-        this.delegate = Preconditions.checkNotNull(delegate);
+        this.delegate = requireNonNull(delegate);
     }
 
     static DataTreeModificationCursorAdaptor of(final DataTreeModificationCursor dataTreeCursor) {
index 324a8be5404e1b791b2817197bd959a0aa6f4bbf..30e3c529d44e6bbfa2246146e59f2b13ba5cf700 100644 (file)
@@ -8,7 +8,8 @@
 
 package org.opendaylight.mdsal.dom.store.inmemory;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
@@ -29,8 +30,8 @@ public class ForeignShardThreePhaseCommitCohort implements DOMStoreThreePhaseCom
 
     public ForeignShardThreePhaseCommitCohort(final DOMDataTreeIdentifier prefix,
             final ForeignShardModificationContext shard) {
-        this.prefix = Preconditions.checkNotNull(prefix);
-        this.shard = Preconditions.checkNotNull(shard);
+        this.prefix = requireNonNull(prefix);
+        this.shard = requireNonNull(shard);
     }
 
     @Override
index 1f8c9cbcd372d7b0e20d4fa49f2b31035e87a15f..e8aab53883f87cf842752be04b94c0f171e2ef25 100644 (file)
@@ -8,6 +8,8 @@
 
 package org.opendaylight.mdsal.dom.store.inmemory;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -34,9 +36,9 @@ class InMemoryDOMDataTreeShardThreePhaseCommitCohort implements DOMStoreThreePha
     InMemoryDOMDataTreeShardThreePhaseCommitCohort(final DataTree dataTree,
                                                    final DataTreeModification modification,
                                                    final InMemoryDOMDataTreeShardChangePublisher changePublisher) {
-        this.dataTree = Preconditions.checkNotNull(dataTree);
-        this.modification = Preconditions.checkNotNull(modification);
-        this.changePublisher = Preconditions.checkNotNull(changePublisher);
+        this.dataTree = requireNonNull(dataTree);
+        this.modification = requireNonNull(modification);
+        this.changePublisher = requireNonNull(changePublisher);
     }
 
     @SuppressWarnings("checkstyle:IllegalCatch")
index 6f16abb33d3c010b352d129aeac7df7661d5f668..d41981665c5eedf8678ff604974291bbaa935c85 100644 (file)
@@ -9,8 +9,8 @@
 package org.opendaylight.mdsal.dom.store.inmemory;
 
 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.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import org.opendaylight.mdsal.common.api.OptimisticLockFailedException;
@@ -39,9 +39,9 @@ class InMemoryDOMStoreThreePhaseCommitCohort implements DOMStoreThreePhaseCommit
                                            final SnapshotBackedWriteTransaction<String> writeTransaction,
                                            final DataTreeModification modification,
                                            final Exception operationError) {
-        this.transaction = Preconditions.checkNotNull(writeTransaction);
-        this.modification = Preconditions.checkNotNull(modification);
-        this.store = Preconditions.checkNotNull(store);
+        this.transaction = requireNonNull(writeTransaction);
+        this.modification = requireNonNull(modification);
+        this.store = requireNonNull(store);
         this.operationError = operationError;
     }
 
index 179e4f89149916f0746cda645e0cc883f34b7956..483cb34681f1e12b51b677075f837d62ec25d4e3 100644 (file)
@@ -8,7 +8,8 @@
 
 package org.opendaylight.mdsal.dom.store.inmemory;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import org.opendaylight.mdsal.dom.spi.shard.AbstractDataModificationCursor;
 import org.opendaylight.mdsal.dom.spi.shard.WriteCursorStrategy;
 
@@ -19,7 +20,7 @@ class InMemoryShardDataModificationCursor extends AbstractDataModificationCursor
     InMemoryShardDataModificationCursor(final ShardDataModification root,
                                         final InmemoryDOMDataTreeShardWriteTransaction parent) {
         super(root);
-        this.parent = Preconditions.checkNotNull(parent);
+        this.parent = requireNonNull(parent);
     }
 
     @Override
index c772ee90ed7f4ff6eeff9ee8f079d7fa5b8faf06..4a02a01b3f528bfdaff41e6717055a70d728beec 100644 (file)
@@ -7,8 +7,9 @@
  */
 package org.opendaylight.mdsal.dom.store.inmemory;
 
+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.mdsal.dom.api.DOMDataTreeIdentifier;
@@ -27,7 +28,7 @@ final class InMemoryShardDataModificationFactory {
             final DOMDataTreeIdentifier root,
             final Map<PathArgument, WriteableModificationNode> children,
             final Map<DOMDataTreeIdentifier, ForeignShardModificationContext> childShards) {
-        this.root = Preconditions.checkNotNull(root);
+        this.root = requireNonNull(root);
         this.children = ImmutableMap.copyOf(children);
         this.childShards = ImmutableMap.copyOf(childShards);
     }
index 8b3eddaaacc24c0a796a0304ef3ef40f37e1c0fa..3472d9c69f5956b73aa19add0dc34931fe0da874 100644 (file)
@@ -8,6 +8,8 @@
 
 package org.opendaylight.mdsal.dom.store.inmemory;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListeningExecutorService;
@@ -101,9 +103,9 @@ class InmemoryDOMDataTreeShardWriteTransaction implements DOMDataTreeShardWriteT
                                              final InMemoryDOMDataTreeShardChangePublisher changePublisher,
                                              final ListeningExecutorService executor) {
         this.producer = producer;
-        this.modification = Preconditions.checkNotNull(root);
-        this.rootShardDataTree = Preconditions.checkNotNull(rootShardDataTree);
-        this.changePublisher = Preconditions.checkNotNull(changePublisher);
+        this.modification = requireNonNull(root);
+        this.rootShardDataTree = requireNonNull(rootShardDataTree);
+        this.changePublisher = requireNonNull(changePublisher);
         this.identifier = "INMEMORY-SHARD-TX-" + COUNTER.getAndIncrement();
         LOG.debug("Shard transaction{} created", identifier);
         this.executor = executor;
@@ -155,7 +157,7 @@ class InmemoryDOMDataTreeShardWriteTransaction implements DOMDataTreeShardWriteT
     }
 
     void cursorClosed() {
-        Preconditions.checkNotNull(cursor);
+        requireNonNull(cursor);
         modification.closeCursor();
         cursor = null;
     }
@@ -168,7 +170,7 @@ class InmemoryDOMDataTreeShardWriteTransaction implements DOMDataTreeShardWriteT
     public void ready() {
         Preconditions.checkState(!finished, "Attempting to ready an already finished transaction.");
         Preconditions.checkState(cursor == null, "Attempting to ready a transaction that has an open cursor.");
-        Preconditions.checkNotNull(modification, "Attempting to ready an empty transaction.");
+        requireNonNull(modification, "Attempting to ready an empty transaction.");
 
         LOG.debug("Readying open transaction on shard {}", modification.getPrefix());
         rootModification = modification.seal();
@@ -187,7 +189,7 @@ class InmemoryDOMDataTreeShardWriteTransaction implements DOMDataTreeShardWriteT
     public ListenableFuture<Void> submit() {
         LOG.debug("Submitting open transaction on shard {}", modification.getPrefix());
 
-        Preconditions.checkNotNull(cohorts);
+        requireNonNull(cohorts);
         Preconditions.checkState(!cohorts.isEmpty(), "Transaction was not readied yet.");
 
         return executor.submit(new ShardSubmitCoordinationTask(modification.getPrefix(), cohorts, this));
@@ -212,7 +214,7 @@ class InmemoryDOMDataTreeShardWriteTransaction implements DOMDataTreeShardWriteT
     }
 
     DataTreeModification getRootModification() {
-        Preconditions.checkNotNull(rootModification, "Transaction wasn't sealed yet");
+        requireNonNull(rootModification, "Transaction wasn't sealed yet");
         return rootModification;
     }
 
index b46481f73e49225fe37ff6d5d9857d37b829ebe0..633876492ea76ce8a31a28b8e81ec1e5b2f010f0 100644 (file)
@@ -8,8 +8,9 @@
 
 package org.opendaylight.mdsal.dom.store.inmemory;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.ListenableFuture;
 import java.util.Collection;
 import java.util.concurrent.Callable;
@@ -33,8 +34,8 @@ public class ShardCanCommitCoordinationTask implements Callable<Boolean> {
 
     public ShardCanCommitCoordinationTask(final DOMDataTreeIdentifier rootShardPrefix,
                                        final Collection<DOMStoreThreePhaseCommitCohort> cohorts) {
-        this.rootShardPrefix = Preconditions.checkNotNull(rootShardPrefix);
-        this.cohorts = Preconditions.checkNotNull(cohorts);
+        this.rootShardPrefix = requireNonNull(rootShardPrefix);
+        this.cohorts = requireNonNull(cohorts);
     }
 
     @Override
index a6adbb675f3f3acbfe7b786d32b5926edb6f86a6..9480bbbd78e46a9e41919f0c02be5a9427762ed8 100644 (file)
@@ -8,8 +8,9 @@
 
 package org.opendaylight.mdsal.dom.store.inmemory;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.ListenableFuture;
 import java.util.Collection;
 import java.util.concurrent.Callable;
@@ -35,9 +36,9 @@ public class ShardCommitCoordinationTask implements Callable<Void> {
     public ShardCommitCoordinationTask(final DOMDataTreeIdentifier rootShardPrefix,
                                        final Collection<DOMStoreThreePhaseCommitCohort> cohorts,
                                        final InmemoryDOMDataTreeShardWriteTransaction transaction) {
-        this.rootShardPrefix = Preconditions.checkNotNull(rootShardPrefix);
-        this.cohorts = Preconditions.checkNotNull(cohorts);
-        this.transaction = Preconditions.checkNotNull(transaction);
+        this.rootShardPrefix = requireNonNull(rootShardPrefix);
+        this.cohorts = requireNonNull(cohorts);
+        this.transaction = requireNonNull(transaction);
     }
 
     @Override
index 5999da0a4c818bc43da874483e23e569ffa9e1f0..c922ab2ae50cce79fe99dbe73606f310b0b83cde 100644 (file)
@@ -8,7 +8,8 @@
 
 package org.opendaylight.mdsal.dom.store.inmemory;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
@@ -30,7 +31,7 @@ public final class ShardDataModification extends WriteableNodeWithSubshard {
                           final Map<PathArgument, WriteableModificationNode> subshards,
                           final Map<DOMDataTreeIdentifier, ForeignShardModificationContext> childShards) {
         super(subshards);
-        this.rootContext = Preconditions.checkNotNull(boundary);
+        this.rootContext = requireNonNull(boundary);
         this.childShards = ImmutableMap.copyOf(childShards);
     }
 
index e2f9caebedaa58a50bd31d440167a318f1d117f2..ff7c9724d901bc7a60a27bd4a00518d4d53e91e4 100644 (file)
@@ -8,7 +8,8 @@
 
 package org.opendaylight.mdsal.dom.store.inmemory;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -26,7 +27,7 @@ public abstract class ShardDataModificationFactoryBuilder<T> extends Modificatio
     protected final Map<DOMDataTreeIdentifier, ForeignShardModificationContext> childShards = new HashMap<>();
 
     public ShardDataModificationFactoryBuilder(final DOMDataTreeIdentifier root) {
-        this.root = Preconditions.checkNotNull(root);
+        this.root = requireNonNull(root);
     }
 
     public void addSubshard(final ForeignShardModificationContext value) {
index 11f03d993d4b722f4e63424812ff7fb980e5ad44..f6cc727eb40ae3341fcfb451b492f414dd829a26 100644 (file)
@@ -8,7 +8,8 @@
 
 package org.opendaylight.mdsal.dom.store.inmemory;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
 import org.opendaylight.yangtools.concepts.Identifiable;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
@@ -28,8 +29,8 @@ class ShardRootModificationContext implements Identifiable<DOMDataTreeIdentifier
 
     ShardRootModificationContext(final DOMDataTreeIdentifier identifier,
             final CursorAwareDataTreeSnapshot snapshot) {
-        this.identifier = Preconditions.checkNotNull(identifier);
-        this.snapshot = Preconditions.checkNotNull(snapshot);
+        this.identifier = requireNonNull(identifier);
+        this.snapshot = requireNonNull(snapshot);
     }
 
     @Override
index 6034e0b6b0f3b41c065071c3b03340ae70873513..e129a0912df15481a2cef2fcbd0ebeea5c93159d 100644 (file)
@@ -8,8 +8,9 @@
 
 package org.opendaylight.mdsal.dom.store.inmemory;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
 import java.util.Collection;
 import java.util.concurrent.Callable;
 import org.opendaylight.mdsal.common.api.TransactionCommitFailedException;
@@ -37,7 +38,7 @@ public class ShardSubmitCoordinationTask implements Callable<Void> {
     public ShardSubmitCoordinationTask(final DOMDataTreeIdentifier rootShardPrefix,
                                        final Collection<DOMStoreThreePhaseCommitCohort> cohorts,
                                        final InmemoryDOMDataTreeShardWriteTransaction transaction) {
-        this.rootShardPrefix = Preconditions.checkNotNull(rootShardPrefix);
+        this.rootShardPrefix = requireNonNull(rootShardPrefix);
         this.transaction = transaction;
 
         canCommitCoordinationTask = new ShardCanCommitCoordinationTask(rootShardPrefix, cohorts);
index 871a8616c5b5378a538efbdc57436293b38f4e6c..319cc63cef26016bd75051754a73b614f7204e4a 100644 (file)
@@ -7,7 +7,8 @@
  */
 package org.opendaylight.mdsal.eos.binding.dom.adapter;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import org.opendaylight.mdsal.eos.binding.api.Entity;
 import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipCandidateRegistration;
 import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipCandidateRegistration;
@@ -26,7 +27,7 @@ class BindingEntityOwnershipCandidateRegistration extends AbstractObjectRegistra
     BindingEntityOwnershipCandidateRegistration(DOMEntityOwnershipCandidateRegistration domRegistration,
             Entity entity) {
         super(entity);
-        this.domRegistration = Preconditions.checkNotNull(domRegistration);
+        this.domRegistration = requireNonNull(domRegistration);
     }
 
     @Override
index 800fc7ec606278d77a8f287956019269e964c0ee..6d83f19f95a04a46f7a74491d953eb8c579c8589 100644 (file)
@@ -7,7 +7,8 @@
  */
 package org.opendaylight.mdsal.eos.binding.dom.adapter;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipListener;
 import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipListenerRegistration;
 import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipListenerRegistration;
@@ -27,8 +28,8 @@ class BindingEntityOwnershipListenerRegistration extends AbstractObjectRegistrat
     BindingEntityOwnershipListenerRegistration(String entityType, EntityOwnershipListener listener,
             DOMEntityOwnershipListenerRegistration domRegistration) {
         super(listener);
-        this.entityType = Preconditions.checkNotNull(entityType);
-        this.domRegistration = Preconditions.checkNotNull(domRegistration);
+        this.entityType = requireNonNull(entityType);
+        this.domRegistration = requireNonNull(domRegistration);
     }
 
     @Override
index 3b1cee14d70d424d1c1866428ff1ba0c4f4d95cd..5fc2ff2e032a8d2ec1ff6523ec34ab1391250098 100644 (file)
@@ -7,8 +7,9 @@
  */
 package org.opendaylight.mdsal.eos.binding.api;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.eos.common.api.GenericEntity;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.core.general.entity.rev150930.EntityKey;
@@ -42,6 +43,6 @@ public class Entity extends GenericEntity<InstanceIdentifier<?>> {
     public Entity(final @NonNull String type, final @NonNull String entityName) {
         super(type, InstanceIdentifier.builder(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang
                 .mdsal.core.general.entity.rev150930.Entity.class,
-                    new EntityKey(Preconditions.checkNotNull(entityName, "entityName should not be null"))).build());
+                    new EntityKey(requireNonNull(entityName, "entityName should not be null"))).build());
     }
 }
index feac6315b10ed5bef9139acf4ab6a64fd87437c3..ad8da3740afada277d1ef7ace27a7b903c7e40cb 100644 (file)
@@ -7,8 +7,9 @@
  */
 package org.opendaylight.mdsal.eos.dom.api;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.Beta;
-import com.google.common.base.Preconditions;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.eos.common.api.GenericEntity;
 import org.opendaylight.yangtools.yang.common.QName;
@@ -45,6 +46,6 @@ public class DOMEntity extends GenericEntity<YangInstanceIdentifier> {
      */
     public DOMEntity(final @NonNull String type, final @NonNull String entityName) {
         super(type, YangInstanceIdentifier.builder().node(ENTITY).nodeWithKey(ENTITY, ENTITY_NAME,
-                Preconditions.checkNotNull(entityName, "entityName should not be null")).build());
+                requireNonNull(entityName, "entityName should not be null")).build());
     }
 }
index 8fc0334bb6f70f1e8a5f5df1a23a25f9971b5db9..8a9ce266c386b36045f081175c36d088bf492076 100644 (file)
@@ -7,13 +7,13 @@
  */
 package org.opendaylight.mdsal.eos.dom.simple;
 
+import static java.util.Objects.requireNonNull;
 import static org.opendaylight.mdsal.eos.common.api.EntityOwnershipChangeState.LOCAL_OWNERSHIP_GRANTED;
 import static org.opendaylight.mdsal.eos.common.api.EntityOwnershipChangeState.LOCAL_OWNERSHIP_LOST_NO_OWNER;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Preconditions;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.HashBasedTable;
 import com.google.common.collect.ImmutableList;
@@ -58,7 +58,7 @@ public final class SimpleDOMEntityOwnershipService implements DOMEntityOwnership
 
     @VisibleForTesting
     SimpleDOMEntityOwnershipService(final UUID uuid) {
-        this.uuid = Preconditions.checkNotNull(uuid);
+        this.uuid = requireNonNull(uuid);
     }
 
     public SimpleDOMEntityOwnershipService() {
@@ -187,7 +187,7 @@ public final class SimpleDOMEntityOwnershipService implements DOMEntityOwnership
 
         ListenerRegistration(final String entityType, final DOMEntityOwnershipListener listener) {
             super(listener);
-            this.entityType = Preconditions.checkNotNull(entityType);
+            this.entityType = requireNonNull(entityType);
         }
 
         @Override
index 012fb3231fcf93cb97786b4b17bfa41dc69dedd7..21322b375be6261b995374d1efc70e5bfa016cd4 100644 (file)
@@ -8,13 +8,13 @@
 
 package org.opendaylight.mdsal.model.ietf.util;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
 
 public class IpClass {
     private final String _value;
 
     public IpClass(final String value) {
-        this._value = Preconditions.checkNotNull(value);
+        this._value = requireNonNull(value);
     }
 
     public IpClass(final IpClass template) {