Eliminate OpenApiApplication class

[netconf.git] / restconf / restconf-openapi / src / main / java / org / opendaylight / restconf / openapi / jaxrs / WebInitializer.java

diff --git a/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/jaxrs/WebInitializer.java b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/jaxrs/WebInitializer.java
index 6ff25a389d2859ef1882bef068bc50d46617cbad..c9060e87b5e87347987d6216933c2771b13e2f5a 100644 (file)
--- a/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/jaxrs/WebInitializer.java
+++ b/restconf/restconf-openapi/src/main/java/org/opendaylight/restconf/openapi/jaxrs/WebInitializer.java
@@ -7,10 +7,13 @@
  */
 package org.opendaylight.restconf.openapi.jaxrs;
 
+import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
+import java.util.Set;
 import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.servlet.ServletException;
+import javax.ws.rs.core.Application;
 import org.opendaylight.aaa.web.ResourceDetails;
 import org.opendaylight.aaa.web.ServletDetails;
 import org.opendaylight.aaa.web.WebContext;
@@ -44,7 +47,12 @@ public final class WebInitializer implements AutoCloseable {
             .contextPath("/openapi")
             .supportsSessions(true)
             .addServlet(ServletDetails.builder()
-                .servlet(servletSupport.createHttpServletBuilder(new OpenApiApplication(openApiService)).build())
+                .servlet(servletSupport.createHttpServletBuilder(new Application() {
+                    @Override
+                    public Set<Object> getSingletons() {
+                        return Set.of(openApiService, new JacksonJaxbJsonProvider());
+                    }
+                }).build())
                 .addUrlPattern("/api/v3/*")
                 .build())
             .addResource(ResourceDetails.builder().name("/explorer").build());