Convert mdsal-binding-runtime-osgi to a JPMS module

[mdsal.git] / binding / mdsal-binding-runtime-osgi / src / main / java / org / opendaylight / mdsal / binding / runtime / osgi / impl / GlobalBindingRuntimeContext.java

diff --git a/binding/mdsal-binding-runtime-osgi/src/main/java/org/opendaylight/mdsal/binding/runtime/osgi/impl/GlobalBindingRuntimeContext.java b/binding/mdsal-binding-runtime-osgi/src/main/java/org/opendaylight/mdsal/binding/runtime/osgi/impl/GlobalBindingRuntimeContext.java
index 46f7d2e9248b7ba5f23d3d1a690fe9f43a92ae97..551efb3c44e24a9c7320a8debe1e4e650ee7ba75 100644 (file)
--- a/binding/mdsal-binding-runtime-osgi/src/main/java/org/opendaylight/mdsal/binding/runtime/osgi/impl/GlobalBindingRuntimeContext.java
+++ b/binding/mdsal-binding-runtime-osgi/src/main/java/org/opendaylight/mdsal/binding/runtime/osgi/impl/GlobalBindingRuntimeContext.java
@@ -9,7 +9,6 @@ package org.opendaylight.mdsal.binding.runtime.osgi.impl;
 
 import static com.google.common.base.Verify.verifyNotNull;
 
-import com.google.common.annotations.Beta;
 import com.google.common.primitives.UnsignedLong;
 import org.opendaylight.mdsal.binding.runtime.api.BindingRuntimeContext;
 import org.opendaylight.mdsal.binding.runtime.osgi.OSGiBindingRuntimeContext;
@@ -24,29 +23,25 @@ import org.slf4j.LoggerFactory;
 /**
  * A global {@link BindingRuntimeContext}. It is injected with latest {@link OSGiBindingRuntimeContext} generation.
  */
-@Beta
 @Component(service = BindingRuntimeContext.class, immediate = true)
 public final class GlobalBindingRuntimeContext extends ForwardingBindingRuntimeContext {
     private static final Logger LOG = LoggerFactory.getLogger(GlobalBindingRuntimeContext.class);
 
-    @Reference
-    OSGiBindingRuntimeContext osgi = null;
-
+    private final UnsignedLong generation;
     private BindingRuntimeContext delegate;
-    private UnsignedLong generation;
-
-    @Override
-    protected BindingRuntimeContext delegate() {
-        return verifyNotNull(delegate);
-    }
 
     @Activate
-    void activate() {
+    public GlobalBindingRuntimeContext(@Reference final OSGiBindingRuntimeContext osgi) {
         generation = osgi.getGeneration();
         delegate = osgi.getService();
         LOG.info("Global BindingRuntimeContext generation {} activated", generation);
     }
 
+    @Override
+    protected BindingRuntimeContext delegate() {
+        return verifyNotNull(delegate);
+    }
+
     @Deactivate
     void deactivate() {
         delegate = null;