Convert bierman02 from web.xml to programmtic web API

[netconf.git] / restconf / restconf-nb-bierman02 / src / main / java / org / opendaylight / netconf / sal / rest / impl / RestconfApplication.java

diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfApplication.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfApplication.java
index 97227bded52e1082b7a4e3c73053b4ef8f6e3264..54a81d6b9871f4cf7925865b932837fe0013ecd0 100644 (file)
--- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfApplication.java
+++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfApplication.java
@@ -16,19 +16,23 @@ import org.opendaylight.netconf.md.sal.rest.schema.SchemaExportContentYinBodyWri
 import org.opendaylight.netconf.md.sal.rest.schema.SchemaRetrievalServiceImpl;
 import org.opendaylight.netconf.sal.restconf.impl.BrokerFacade;
 import org.opendaylight.netconf.sal.restconf.impl.ControllerContext;
-import org.opendaylight.netconf.sal.restconf.impl.RestconfImpl;
 import org.opendaylight.netconf.sal.restconf.impl.StatisticsRestconfServiceWrapper;
 
 public class RestconfApplication extends Application {
+    private final ControllerContext controllerContext;
+    private final BrokerFacade brokerFacade;
+    private final StatisticsRestconfServiceWrapper statsServiceWrapper;
+
+    public RestconfApplication(ControllerContext controllerContext, BrokerFacade brokerFacade,
+            StatisticsRestconfServiceWrapper statsServiceWrapper) {
+        this.controllerContext = controllerContext;
+        this.brokerFacade = brokerFacade;
+        this.statsServiceWrapper = statsServiceWrapper;
+    }
 
     @Override
     public Set<Class<?>> getClasses() {
         return ImmutableSet.<Class<?>>builder()
-                .add(RestconfDocumentedExceptionMapper.class)
-                .add(XmlNormalizedNodeBodyReader.class)
-                .add(JsonNormalizedNodeBodyReader.class)
-                .add(JsonToPatchBodyReader.class)
-                .add(XmlToPatchBodyReader.class)
                 .add(PatchJsonBodyWriter.class)
                 .add(PatchXmlBodyWriter.class)
                 .add(NormalizedNodeJsonBodyWriter.class)
@@ -41,16 +45,16 @@ public class RestconfApplication extends Application {
     @Override
     public Set<Object> getSingletons() {
         final Set<Object> 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(schemaRetrieval);
-        singletons.add(new RestconfCompositeWrapper(StatisticsRestconfServiceWrapper.getInstance(), schemaRetrieval));
+        singletons.add(new RestconfCompositeWrapper(statsServiceWrapper, schemaRetrieval));
+        singletons.add(new RestconfDocumentedExceptionMapper(controllerContext));
+        singletons.add(new XmlNormalizedNodeBodyReader(controllerContext));
+        singletons.add(new JsonNormalizedNodeBodyReader(controllerContext));
+        singletons.add(new XmlToPatchBodyReader(controllerContext));
+        singletons.add(new JsonToPatchBodyReader(controllerContext));
 //        singletons.add(StructuredDataToXmlProvider.INSTANCE);
 //        singletons.add(StructuredDataToJsonProvider.INSTANCE);
 //        singletons.add(JsonToCompositeNodeProvider.INSTANCE);