Bump upstreams

[netconf.git] / netconf / yanglib / src / main / java / org / opendaylight / yanglib / impl / WebInitializer.java

diff --git a/netconf/yanglib/src/main/java/org/opendaylight/yanglib/impl/WebInitializer.java b/netconf/yanglib/src/main/java/org/opendaylight/yanglib/impl/WebInitializer.java
index b91791bee89b204e29ea6607a9b65ec602267012..efb356b1065bda8c662865083f3d81ea4c73a678 100644 (file)
--- a/netconf/yanglib/src/main/java/org/opendaylight/yanglib/impl/WebInitializer.java
+++ b/netconf/yanglib/src/main/java/org/opendaylight/yanglib/impl/WebInitializer.java
@@ -11,31 +11,33 @@ import javax.servlet.ServletException;
 import javax.ws.rs.core.Application;
 import org.opendaylight.aaa.web.ServletDetails;
 import org.opendaylight.aaa.web.WebContext;
-import org.opendaylight.aaa.web.WebContextBuilder;
-import org.opendaylight.aaa.web.WebContextRegistration;
 import org.opendaylight.aaa.web.WebContextSecurer;
 import org.opendaylight.aaa.web.WebServer;
+import org.opendaylight.aaa.web.servlet.ServletSupport;
+import org.opendaylight.yangtools.concepts.Registration;
 
 /**
  * Initializes the wep app.
  *
  * @author Thomas Pantelis
  */
-public class WebInitializer {
-    private final WebContextRegistration registration;
+public final class WebInitializer implements AutoCloseable {
+    private final Registration registration;
 
-    public WebInitializer(WebServer webServer,  WebContextSecurer webContextSecurer, Application webApp)
-            throws ServletException {
-        WebContextBuilder webContextBuilder = WebContext.builder().contextPath("yanglib").supportsSessions(true)
-            .addServlet(ServletDetails.builder().servlet(
-                new com.sun.jersey.spi.container.servlet.ServletContainer(webApp))
-                    .addUrlPattern("/*").build());
+    public WebInitializer(final WebServer webServer,  final WebContextSecurer webContextSecurer,
+            final ServletSupport servletSupport, final Application webApp) throws ServletException {
+        final var webContextBuilder = WebContext.builder().contextPath("/yanglib").supportsSessions(true)
+            .addServlet(ServletDetails.builder()
+                .servlet(servletSupport.createHttpServletBuilder(webApp).build())
+                .addUrlPattern("/*")
+                .build());
 
         webContextSecurer.requireAuthentication(webContextBuilder, "/*");
 
         registration = webServer.registerWebContext(webContextBuilder.build());
     }
 
+    @Override
     public void close() {
         registration.close();
     }