From 892d518aa992e0a5aa8b1a011881dbaead08c071 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 31 Jul 2014 17:47:47 +0200 Subject: [PATCH] BUG-997: migrate the global context schema service This change test-drives the new re-implementation, making sure we have a user. An immediate advantage should be faster context convergence times. Requires I3311a3f0251868f91c385d0291365934ccfb9ede in yangtools. Change-Id: Ic2f07144043f456ab9821013c1d690904c9a791f Signed-off-by: Robert Varga --- .../dom/broker/GlobalBundleScanningSchemaServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 c4418c7911..4911bfe603 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 @@ -28,7 +28,7 @@ import org.opendaylight.yangtools.util.ListenerRegistry; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaContextListener; -import org.opendaylight.yangtools.yang.parser.impl.util.URLSchemaContextResolver; +import org.opendaylight.yangtools.yang.parser.repo.URLSchemaContextResolver; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleEvent; @@ -44,7 +44,7 @@ public class GlobalBundleScanningSchemaServiceImpl implements SchemaContextProvi private static final Logger LOG = LoggerFactory.getLogger(GlobalBundleScanningSchemaServiceImpl.class); private final ListenerRegistry listeners = new ListenerRegistry<>(); - private final URLSchemaContextResolver contextResolver = new URLSchemaContextResolver(); + private final URLSchemaContextResolver contextResolver = URLSchemaContextResolver.create("global-bundle"); private final BundleScanner scanner = new BundleScanner(); private final BundleContext context; @@ -233,7 +233,7 @@ public class GlobalBundleScanningSchemaServiceImpl implements SchemaContextProvi if (starting) { return; } - Optional schema = contextResolver.tryToUpdateSchemaContext(); + Optional schema = contextResolver.getSchemaContext(); if(schema.isPresent()) { updateContext(schema.get()); } -- 2.36.6