X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-rest-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Frest%2Fimpl%2FRestconfApplication.java;h=9ab8fa84010753ee039b4a55c0a4104ebb0415a2;hb=3927509ec3ecfa32a51b725d2b7155d425f5b877;hp=c9496af4c86d4838b6ee570e26b2b84ac8c34e26;hpb=b7662456be862b9cb81996ac553c0945b7c08dd0;p=controller.git diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/RestconfApplication.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/RestconfApplication.java index c9496af4c8..9ab8fa8401 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/RestconfApplication.java +++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/RestconfApplication.java @@ -11,6 +11,9 @@ import com.google.common.collect.ImmutableSet; import java.util.HashSet; import java.util.Set; import javax.ws.rs.core.Application; +import org.opendaylight.controller.md.sal.rest.schema.SchemaExportContentYangBodyWriter; +import org.opendaylight.controller.md.sal.rest.schema.SchemaExportContentYinBodyWriter; +import org.opendaylight.controller.md.sal.rest.schema.SchemaRetrievalServiceImpl; import org.opendaylight.controller.sal.restconf.impl.BrokerFacade; import org.opendaylight.controller.sal.restconf.impl.ControllerContext; import org.opendaylight.controller.sal.restconf.impl.RestconfImpl; @@ -26,20 +29,24 @@ public class RestconfApplication extends Application { .add(JsonNormalizedNodeBodyReader.class) .add(NormalizedNodeJsonBodyWriter.class) .add(NormalizedNodeXmlBodyWriter.class) + .add(SchemaExportContentYinBodyWriter.class) + .add(SchemaExportContentYangBodyWriter.class) .build(); } @Override public Set getSingletons() { - Set singletons = new HashSet<>(); - ControllerContext controllerContext = ControllerContext.getInstance(); - BrokerFacade brokerFacade = BrokerFacade.getInstance(); - RestconfImpl restconfImpl = RestconfImpl.getInstance(); + final Set singletons = new HashSet<>(); + final ControllerContext controllerContext = ControllerContext.getInstance(); + final BrokerFacade brokerFacade = BrokerFacade.getInstance(); + final RestconfImpl restconfImpl = RestconfImpl.getInstance(); + final SchemaRetrievalServiceImpl schemaRetrieval = new SchemaRetrievalServiceImpl(controllerContext); restconfImpl.setBroker(brokerFacade); restconfImpl.setControllerContext(controllerContext); singletons.add(controllerContext); singletons.add(brokerFacade); - singletons.add(StatisticsRestconfServiceWrapper.getInstance()); + singletons.add(schemaRetrieval); + singletons.add(new RestconfCompositeWrapper(StatisticsRestconfServiceWrapper.getInstance(), schemaRetrieval)); singletons.add(StructuredDataToXmlProvider.INSTANCE); singletons.add(StructuredDataToJsonProvider.INSTANCE); singletons.add(JsonToCompositeNodeProvider.INSTANCE);