diff options
Diffstat (limited to 'sdnr/wt/data-provider/provider/src')
2 files changed, 8 insertions, 8 deletions
diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/http/DataTreeHttpServlet.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/http/DataTreeHttpServlet.java index 2f7b9e3fc..39239fdf7 100644 --- a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/http/DataTreeHttpServlet.java +++ b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/http/DataTreeHttpServlet.java @@ -32,7 +32,6 @@ import java.util.List; import java.util.Optional; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.servlet.Servlet; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; @@ -41,9 +40,6 @@ import org.json.JSONObject; import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.InventoryTreeProvider; import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.types.DataTreeObject; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.Entity; -import org.osgi.service.component.annotations.Component; -import org.osgi.service.http.whiteboard.propertytypes.HttpWhiteboardServletName; -import org.osgi.service.http.whiteboard.propertytypes.HttpWhiteboardServletPattern; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -52,12 +48,13 @@ import org.slf4j.LoggerFactory; * */ -@HttpWhiteboardServletPattern("/tree/*") -@HttpWhiteboardServletName("DataTreeHttpServlet") -@Component(service = Servlet.class) +//@HttpWhiteboardServletPattern("/tree/*") +//@HttpWhiteboardServletName("DataTreeHttpServlet") +//@Component(service = Servlet.class) public class DataTreeHttpServlet extends HttpServlet { private static final long serialVersionUID = 1L; + public static final String URI_PRE = "/tree"; private InventoryTreeProvider dataTreeProvider; private static final Logger LOG = LoggerFactory.getLogger(DataTreeHttpServlet.class); diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/impl/DataProviderImpl.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/impl/DataProviderImpl.java index 71ff7a85b..d7ae4cc51 100644 --- a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/impl/DataProviderImpl.java +++ b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/impl/DataProviderImpl.java @@ -102,7 +102,9 @@ public class DataProviderImpl implements IEntityDataProvider, AutoCloseable { public void onUnbindService(HttpService httpService) { httpService.unregister(AboutHttpServlet.URI_PRE); + httpService.unregister(DataTreeHttpServlet.URI_PRE); this.aboutServlet = null; + this.treeServlet = null; } public void onBindService(HttpService httpService) @@ -111,7 +113,8 @@ public class DataProviderImpl implements IEntityDataProvider, AutoCloseable { LOG.warn("Unable to inject HttpService into loader."); } else { httpService.registerServlet(AboutHttpServlet.URI_PRE, aboutServlet, null, null); - LOG.info("about servlet registered."); + httpService.registerServlet(DataTreeHttpServlet.URI_PRE, treeServlet, null, null); + LOG.info("about servlet and tree servlet registered."); } } |