Switch to Objects.requireNonNull

[mdsal.git] / binding / mdsal-binding-dom-codec-osgi / src / main / java / org / opendaylight / mdsal / binding / dom / codec / osgi / impl / OsgiModuleInfoRegistry.java

diff --git a/binding/mdsal-binding-dom-codec-osgi/src/main/java/org/opendaylight/mdsal/binding/dom/codec/osgi/impl/OsgiModuleInfoRegistry.java b/binding/mdsal-binding-dom-codec-osgi/src/main/java/org/opendaylight/mdsal/binding/dom/codec/osgi/impl/OsgiModuleInfoRegistry.java
index 6b63cf8a7a9dad6c239a6e1fedb7098110bceb2a..8fdf9f8c96a48939f9425ce12bf3c6e718dbc7de 100644 (file)
--- a/binding/mdsal-binding-dom-codec-osgi/src/main/java/org/opendaylight/mdsal/binding/dom/codec/osgi/impl/OsgiModuleInfoRegistry.java
+++ b/binding/mdsal-binding-dom-codec-osgi/src/main/java/org/opendaylight/mdsal/binding/dom/codec/osgi/impl/OsgiModuleInfoRegistry.java
@@ -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,11 +37,12 @@ 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")
     synchronized void updateService() {
         final SchemaContext context;
         try {
@@ -69,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
@@ -78,7 +79,8 @@ final class OsgiModuleInfoRegistry implements ModuleInfoRegistry {
         }
 
         @Override
-        public void close() throws Exception {
+        @SuppressWarnings("checkstyle:illegalCatch")
+        public void close() {
             try {
                 inner.close();
             } finally {