From: Robert Varga Date: Mon, 26 May 2014 08:05:40 +0000 (+0200) Subject: BUG-1070: make BundleContext required X-Git-Tag: autorelease-tag-v20140601202136_82eb3f9~24^2 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=4f84c7cdc09512490d743620eff479b9c69170f2;hp=-c BUG-1070: make BundleContext required It does not make sense to instantiated GlobalBundleScanningSchemaServiceImpl without a bundlecontext, so let's make it required in the constructor, making interactions more clear. Change-Id: I7c36c88e2e26163e0ef41480ea8f5d1d79353e5f Signed-off-by: Robert Varga --- 4f84c7cdc09512490d743620eff479b9c69170f2 diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/SchemaServiceImplSingletonModule.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/SchemaServiceImplSingletonModule.java index 93284c98e1..fd24944018 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/SchemaServiceImplSingletonModule.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/SchemaServiceImplSingletonModule.java @@ -19,29 +19,26 @@ import org.osgi.framework.ServiceReference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** -* -*/ public final class SchemaServiceImplSingletonModule extends - org.opendaylight.controller.config.yang.md.sal.dom.impl.AbstractSchemaServiceImplSingletonModule { +org.opendaylight.controller.config.yang.md.sal.dom.impl.AbstractSchemaServiceImplSingletonModule { private static final Logger LOG = LoggerFactory.getLogger(SchemaServiceImplSingletonModule.class); BundleContext bundleContext; - public SchemaServiceImplSingletonModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, - org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { + public SchemaServiceImplSingletonModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier, + final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { super(identifier, dependencyResolver); } - public SchemaServiceImplSingletonModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, - org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, - SchemaServiceImplSingletonModule oldModule, java.lang.AutoCloseable oldInstance) { + public SchemaServiceImplSingletonModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier, + final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, + final SchemaServiceImplSingletonModule oldModule, final java.lang.AutoCloseable oldInstance) { super(identifier, dependencyResolver, oldModule, oldInstance); } @Override - public boolean canReuseInstance(AbstractSchemaServiceImplSingletonModule oldModule) { + public boolean canReuseInstance(final AbstractSchemaServiceImplSingletonModule oldModule) { return true; } @@ -49,7 +46,7 @@ public final class SchemaServiceImplSingletonModule extends return bundleContext; } - public void setBundleContext(BundleContext bundleContext) { + public void setBundleContext(final BundleContext bundleContext) { this.bundleContext = bundleContext; } @@ -65,8 +62,7 @@ public final class SchemaServiceImplSingletonModule extends return new GlobalSchemaServiceProxy(getBundleContext(), ref); } - GlobalBundleScanningSchemaServiceImpl newInstance = new GlobalBundleScanningSchemaServiceImpl(); - newInstance.setContext(getBundleContext()); + GlobalBundleScanningSchemaServiceImpl newInstance = new GlobalBundleScanningSchemaServiceImpl(getBundleContext()); newInstance.start(); return newInstance; } @@ -77,7 +73,7 @@ public final class SchemaServiceImplSingletonModule extends private ServiceReference reference; private SchemaService delegate; - public GlobalSchemaServiceProxy(BundleContext bundleContext, ServiceReference ref) { + public GlobalSchemaServiceProxy(final BundleContext bundleContext, final ServiceReference ref) { this.bundleContext = bundleContext; this.reference = ref; this.delegate = bundleContext.getService(reference); @@ -102,7 +98,7 @@ public final class SchemaServiceImplSingletonModule extends } @Override - public void addModule(Module arg0) { + public void addModule(final Module arg0) { delegate.addModule(arg0); } @@ -117,12 +113,12 @@ public final class SchemaServiceImplSingletonModule extends } @Override - public ListenerRegistration registerSchemaServiceListener(SchemaServiceListener arg0) { + public ListenerRegistration registerSchemaServiceListener(final SchemaServiceListener arg0) { return delegate.registerSchemaServiceListener(arg0); } @Override - public void removeModule(Module arg0) { + public void removeModule(final Module arg0) { delegate.removeModule(arg0); } 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 076fca6f10..430963a884 100644 --- 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 com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; -public class GlobalBundleScanningSchemaServiceImpl implements // -SchemaContextProvider, // -SchemaService, // -ServiceTrackerCustomizer, // -AutoCloseable { +public class GlobalBundleScanningSchemaServiceImpl implements SchemaContextProvider, SchemaService, ServiceTrackerCustomizer, AutoCloseable { private static final Logger LOG = LoggerFactory.getLogger(GlobalBundleScanningSchemaServiceImpl.class); + private final ListenerRegistry listeners = new ListenerRegistry<>(); private final URLSchemaContextResolver contextResolver = new URLSchemaContextResolver(); private final BundleScanner scanner = new BundleScanner(); + private final BundleContext context; + private ServiceTracker listenerTracker; private BundleTracker>> bundleTracker; - private ListenerRegistry listeners; private boolean starting = true; - private BundleContext context; - - public ListenerRegistry getListeners() { - return listeners; - } - public void setListeners(final ListenerRegistry listeners) { - this.listeners = listeners; + public GlobalBundleScanningSchemaServiceImpl(final BundleContext context) { + this.context = Preconditions.checkNotNull(context); } public BundleContext getContext() { return context; } - public void setContext(final BundleContext context) { - this.context = context; - } - public void start() { checkState(context != null); - if (listeners == null) { - listeners = new ListenerRegistry<>(); - } listenerTracker = new ServiceTracker<>(context, SchemaServiceListener.class, GlobalBundleScanningSchemaServiceImpl.this); - bundleTracker = new BundleTracker>>(context, BundleEvent.RESOLVED - | BundleEvent.UNRESOLVED, scanner); + bundleTracker = new BundleTracker<>(context, BundleEvent.RESOLVED | BundleEvent.UNRESOLVED, scanner); bundleTracker.open(); listenerTracker.open(); starting = false; @@ -219,7 +205,7 @@ AutoCloseable { } public synchronized void tryToUpdateSchemaContext() { - if(starting ) { + if (starting) { return; } Optional schema = contextResolver.tryToUpdateSchemaContext(); diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/SchemaServiceActivator.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/SchemaServiceActivator.java index 344b3f3276..f893f96d18 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/SchemaServiceActivator.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/osgi/SchemaServiceActivator.java @@ -17,20 +17,19 @@ import org.osgi.framework.ServiceRegistration; public class SchemaServiceActivator implements BundleActivator { - + private ServiceRegistration schemaServiceReg; private GlobalBundleScanningSchemaServiceImpl schemaService; @Override - public void start(BundleContext context) throws Exception { - schemaService = new GlobalBundleScanningSchemaServiceImpl(); - schemaService.setContext(context); + public void start(final BundleContext context) { + schemaService = new GlobalBundleScanningSchemaServiceImpl(context); schemaService.start(); schemaServiceReg = context.registerService(SchemaService.class, schemaService, new Hashtable()); } - + @Override - public void stop(BundleContext context) throws Exception { + public void stop(final BundleContext context) throws Exception { schemaServiceReg.unregister(); schemaService.close(); }