X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=restconf%2Frestconf-nb-rfc8040%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Frestconf%2Fnb%2Frfc8040%2Fhandlers%2FDOMDataBrokerHandler.java;h=73623c6041a4fe3b65e0a809ba0bd8244e591b78;hb=8ada2089ecdc76237c8562f333d1f2e2d401fb7b;hp=f53bb405139dea8c8cea6c68b057fb4572301fcf;hpb=b7537d2482ffb05582749ce80a7ca44c64a5ad6c;p=netconf.git

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/handlers/DOMDataBrokerHandler.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/handlers/DOMDataBrokerHandler.java
index f53bb40513..73623c6041 100644
--- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/handlers/DOMDataBrokerHandler.java
+++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/handlers/DOMDataBrokerHandler.java
@@ -7,22 +7,27 @@
  */
 package org.opendaylight.restconf.nb.rfc8040.handlers;
 
+import static java.util.Objects.requireNonNull;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
 
 /**
  * Implementation of {@link DOMDataBrokerHandler}.
  */
-public class DOMDataBrokerHandler implements Handler<DOMDataBroker> {
-
+// FIXME: remove this class
+@Singleton
+public class DOMDataBrokerHandler {
     private final DOMDataBroker broker;
 
+    @Inject
     public DOMDataBrokerHandler(final DOMDataBroker broker) {
-        this.broker = broker;
+        this.broker = requireNonNull(broker);
     }
 
-    @Override
-    public DOMDataBroker get() {
-        return this.broker;
+    public @NonNull DOMDataBroker get() {
+        return broker;
     }
-
 }