Bug 5900 - Jenkins RaceContiditions - problem between Jersey and RestconfProvider

[netconf.git] / restconf / sal-rest-connector / src / main / java / org / opendaylight / restconf / rest / RestConnectorProvider.java

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/RestConnectorProvider.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/RestConnectorProvider.java
index 5cca1deca7d558fcd2b2c24e3ce58488445dc5dc..8dafecbf143f433461cc4c3546530eaf9331f213 100644 (file)
--- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/RestConnectorProvider.java
+++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/RestConnectorProvider.java
@@ -10,15 +10,18 @@ package org.opendaylight.restconf.rest;
 import com.google.common.base.Preconditions;
 import java.util.Collection;
 import java.util.Collections;
+import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService;
 import org.opendaylight.controller.sal.core.api.Broker.ProviderSession;
 import org.opendaylight.controller.sal.core.api.Provider;
 import org.opendaylight.controller.sal.core.api.model.SchemaService;
 import org.opendaylight.netconf.sal.rest.api.RestConnector;
+import org.opendaylight.restconf.rest.api.schema.context.SchemaContextHandler;
+import org.opendaylight.restconf.rest.handlers.api.DOMMountPointServiceHandler;
+import org.opendaylight.restconf.rest.handlers.impl.DOMMountPointServiceHandlerImpl;
+import org.opendaylight.restconf.rest.impl.schema.context.SchemaContextHandlerImpl;
+import org.opendaylight.restconf.rest.impl.services.Draft11ServicesWrapperImpl;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.model.api.SchemaContextListener;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.FrameworkUtil;
-import org.osgi.framework.ServiceReference;
 
 /**
  * Provider for restconf draft11.
@@ -31,16 +34,13 @@ public class RestConnectorProvider implements Provider, RestConnector, AutoClose
     @Override
     public void onSessionInitiated(final ProviderSession session) {
         final SchemaService schemaService = Preconditions.checkNotNull(session.getService(SchemaService.class));
-        final RestconfApplication restApp = getObjectFromBundleContext(RestconfApplication.class,
-                RestconfApplicationService.class.getName());
-        Preconditions.checkNotNull(restApp, "RestconfApplication service doesn't exist.");
-        this.listenerRegistration = schemaService.registerSchemaContextListener(restApp.getSchemaContextHandler());
-    }
+        final DOMMountPointServiceHandler domMountPointServiceHandler = new DOMMountPointServiceHandlerImpl();
+        final SchemaContextHandler schemaCtxHandler = new SchemaContextHandlerImpl();
+        domMountPointServiceHandler.setDOMMountPointService(session.getService(DOMMountPointService.class));
+        final Draft11ServicesWrapperImpl wrapperServices = Draft11ServicesWrapperImpl.getInstance();
+        this.listenerRegistration = schemaService.registerSchemaContextListener(schemaCtxHandler);
 
-    private <T> T getObjectFromBundleContext(final Class<T> type, final String serviceRefName) {
-        final BundleContext bundleContext = FrameworkUtil.getBundle(getClass()).getBundleContext();
-        final ServiceReference<?> serviceReference = bundleContext.getServiceReference(serviceRefName);
-        return (T) bundleContext.getService(serviceReference);
+        wrapperServices.setHandlers(schemaCtxHandler, domMountPointServiceHandler);
     }
 
     @Override