BUG-1070: make BundleContext required

[controller.git] / opendaylight / md-sal / sal-dom-broker / src / main / java / org / opendaylight / controller / sal / dom / broker / GlobalBundleScanningSchemaServiceImpl.java

diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/GlobalBundleScanningSchemaServiceImpl.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/GlobalBundleScanningSchemaServiceImpl.java
index 076fca6f10dbf10070b85ced50aee655c17c94d4..430963a884b4fbaa71a7c3c12d5df9356058be0c 100644 (file)
--- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/GlobalBundleScanningSchemaServiceImpl.java
+++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/GlobalBundleScanningSchemaServiceImpl.java
@@ -36,48 +36,34 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Optional;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.base.Optional;

+import com.google.common.base.Preconditions;

 import com.google.common.collect.ImmutableList;
 
 import com.google.common.collect.ImmutableList;
 

-public class GlobalBundleScanningSchemaServiceImpl implements //
-SchemaContextProvider, //
-SchemaService, //
-ServiceTrackerCustomizer<SchemaServiceListener, SchemaServiceListener>, //
-AutoCloseable {
+public class GlobalBundleScanningSchemaServiceImpl implements SchemaContextProvider, SchemaService, ServiceTrackerCustomizer<SchemaServiceListener, SchemaServiceListener>, AutoCloseable {

     private static final Logger LOG = LoggerFactory.getLogger(GlobalBundleScanningSchemaServiceImpl.class);
 
     private static final Logger LOG = LoggerFactory.getLogger(GlobalBundleScanningSchemaServiceImpl.class);
 

+    private final ListenerRegistry<SchemaServiceListener> listeners = new ListenerRegistry<>();

     private final URLSchemaContextResolver contextResolver = new URLSchemaContextResolver();
     private final BundleScanner scanner = new BundleScanner();
     private final URLSchemaContextResolver contextResolver = new URLSchemaContextResolver();
     private final BundleScanner scanner = new BundleScanner();

+    private final BundleContext context;
+

     private ServiceTracker<SchemaServiceListener, SchemaServiceListener> listenerTracker;
     private BundleTracker<Iterable<Registration<URL>>> bundleTracker;
     private ServiceTracker<SchemaServiceListener, SchemaServiceListener> listenerTracker;
     private BundleTracker<Iterable<Registration<URL>>> bundleTracker;

-    private ListenerRegistry<SchemaServiceListener> listeners;

     private boolean starting = true;
     private boolean starting = true;

-    private BundleContext context;
-
-    public ListenerRegistry<SchemaServiceListener> getListeners() {
-        return listeners;
-    }

 
 

-    public void setListeners(final ListenerRegistry<SchemaServiceListener> listeners) {
-        this.listeners = listeners;
+    public GlobalBundleScanningSchemaServiceImpl(final BundleContext context) {
+        this.context = Preconditions.checkNotNull(context);

     }
 
     public BundleContext getContext() {
         return context;
     }
 
     }
 
     public BundleContext getContext() {
         return context;
     }
 

-    public void setContext(final BundleContext context) {
-        this.context = context;
-    }
-

     public void start() {
         checkState(context != null);
     public void start() {
         checkState(context != null);

-        if (listeners == null) {
-            listeners = new ListenerRegistry<>();
-        }

 
         listenerTracker = new ServiceTracker<>(context, SchemaServiceListener.class, GlobalBundleScanningSchemaServiceImpl.this);
 
         listenerTracker = new ServiceTracker<>(context, SchemaServiceListener.class, GlobalBundleScanningSchemaServiceImpl.this);

-        bundleTracker = new BundleTracker<Iterable<Registration<URL>>>(context, BundleEvent.RESOLVED
-                | BundleEvent.UNRESOLVED, scanner);
+        bundleTracker = new BundleTracker<>(context, BundleEvent.RESOLVED | BundleEvent.UNRESOLVED, scanner);

         bundleTracker.open();
         listenerTracker.open();
         starting = false;
         bundleTracker.open();
         listenerTracker.open();
         starting = false;


@@ -219,7 +205,7 @@ AutoCloseable {
     }
 
     public synchronized void tryToUpdateSchemaContext() {
     }
 
     public synchronized void tryToUpdateSchemaContext() {

-        if(starting ) {
+        if (starting) {

             return;
         }
         Optional<SchemaContext> schema = contextResolver.tryToUpdateSchemaContext();
             return;
         }
         Optional<SchemaContext> schema = contextResolver.tryToUpdateSchemaContext();