X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fconfig%2Fconfig-manager%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fmanager%2Fimpl%2Fosgi%2Fmapping%2FRefreshingSCPModuleInfoRegistry.java;h=6217476fa9f0b3da97c1c39c829c24016233317e;hp=8001169771e6a77a3dc9e2544cab9c91e9fc5cdb;hb=db89afdefb3cfa4454dfdc6008e1d54d3ede66fb;hpb=cd6d62b76aa3de2047457957676905cb59e26315;ds=sidebyside

diff --git a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/mapping/RefreshingSCPModuleInfoRegistry.java b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/mapping/RefreshingSCPModuleInfoRegistry.java
index 8001169771..6217476fa9 100644
--- a/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/mapping/RefreshingSCPModuleInfoRegistry.java
+++ b/opendaylight/config/config-manager/src/main/java/org/opendaylight/controller/config/manager/impl/osgi/mapping/RefreshingSCPModuleInfoRegistry.java
@@ -10,10 +10,10 @@ package org.opendaylight.controller.config.manager.impl.osgi.mapping;
 
 import java.util.Dictionary;
 import java.util.Hashtable;
+import org.opendaylight.mdsal.binding.generator.api.ClassLoadingStrategy;
+import org.opendaylight.mdsal.binding.generator.api.ModuleInfoRegistry;
+import org.opendaylight.mdsal.binding.generator.util.BindingRuntimeContext;
 import org.opendaylight.yangtools.concepts.ObjectRegistration;
-import org.opendaylight.yangtools.sal.binding.generator.api.ClassLoadingStrategy;
-import org.opendaylight.yangtools.sal.binding.generator.api.ModuleInfoRegistry;
-import org.opendaylight.yangtools.sal.binding.generator.util.BindingRuntimeContext;
 import org.opendaylight.yangtools.yang.binding.YangModuleInfo;
 import org.opendaylight.yangtools.yang.model.api.SchemaContextProvider;
 import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource;
@@ -47,20 +47,21 @@ public class RefreshingSCPModuleInfoRegistry implements ModuleInfoRegistry, Auto
         this.classLoadingStrat = classLoadingStrat;
         this.sourceProvider = sourceProvider;
         this.bindingContextProvider = bindingContextProvider;
-        osgiReg = bundleContext
+        this.osgiReg = bundleContext
             .registerService(SchemaContextProvider.class, schemaContextProvider, new Hashtable<String, String>());
     }
 
     public void updateService() {
-        if(osgiReg != null) {
+        if(this.osgiReg != null) {
             try {
-                bindingContextProvider.update(classLoadingStrat, schemaContextProvider);
+                this.bindingContextProvider.update(this.classLoadingStrat, this.schemaContextProvider);
 
                 final Dictionary<String, Object> props = new Hashtable<>();
-                props.put(BindingRuntimeContext.class.getName(), bindingContextProvider.getBindingContext());
-                props.put(SchemaSourceProvider.class.getName(), sourceProvider);
-                osgiReg.setProperties(props); // send modifiedService event
-            } catch (RuntimeException e) {
+                props.put(BindingRuntimeContext.class.getName(), this.bindingContextProvider.getBindingContext());
+                props.put(SchemaSourceProvider.class.getName(), this.sourceProvider);
+                // send modifiedService event
+                this.osgiReg.setProperties(props);
+            } catch (final RuntimeException e) {
                 // The ModuleInfoBackedContext throws a RuntimeException if it can't create the schema context.
                 LOG.warn("Error updating the BindingContextProvider", e);
             }
@@ -69,18 +70,17 @@ public class RefreshingSCPModuleInfoRegistry implements ModuleInfoRegistry, Auto
 
     @Override
     public ObjectRegistration<YangModuleInfo> registerModuleInfo(final YangModuleInfo yangModuleInfo) {
-        ObjectRegistration<YangModuleInfo> yangModuleInfoObjectRegistration = moduleInfoRegistry.registerModuleInfo(yangModuleInfo);
-        ObjectRegistrationWrapper wrapper = new ObjectRegistrationWrapper(yangModuleInfoObjectRegistration);
-        return wrapper;
+        final ObjectRegistration<YangModuleInfo> yangModuleInfoObjectRegistration = this.moduleInfoRegistry.registerModuleInfo(yangModuleInfo);
+        return new ObjectRegistrationWrapper(yangModuleInfoObjectRegistration);
     }
 
     @Override
     public void close() throws Exception {
-        if(osgiReg != null) {
-            osgiReg.unregister();
+        if(this.osgiReg != null) {
+            this.osgiReg.unregister();
         }
 
-        osgiReg = null;
+        this.osgiReg = null;
     }
 
     private class ObjectRegistrationWrapper implements ObjectRegistration<YangModuleInfo> {
@@ -92,18 +92,19 @@ public class RefreshingSCPModuleInfoRegistry implements ModuleInfoRegistry, Auto
 
         @Override
         public YangModuleInfo getInstance() {
-            return inner.getInstance();
+            return this.inner.getInstance();
         }
 
         @Override
         public void close() throws Exception {
-            inner.close();
-            updateService();// send modify event when a bundle disappears
+            this.inner.close();
+            // send modify event when a bundle disappears
+            updateService();
         }
 
         @Override
         public String toString() {
-            return inner.toString();
+            return this.inner.toString();
         }
     }
 }