Hide NormalizedNodeContext and WriterParameters

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

diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/StatisticsRestconfServiceWrapper.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/StatisticsRestconfServiceWrapper.java
index 885d187485accc7bff28ada9e3dcc86cf0597e65..afe4be00e8f96c4506afae0e5b5ef661eec4c3c6 100644 (file)
--- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/StatisticsRestconfServiceWrapper.java
+++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/StatisticsRestconfServiceWrapper.java
@@ -9,14 +9,17 @@ package org.opendaylight.netconf.sal.restconf.impl;
 
 import java.math.BigInteger;
 import java.util.concurrent.atomic.AtomicLong;
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.core.UriInfo;
 import org.opendaylight.netconf.sal.rest.api.RestconfService;
-import org.opendaylight.restconf.common.context.NormalizedNodeContext;
+import org.opendaylight.netconf.sal.rest.impl.NormalizedNodeContext;
 import org.opendaylight.restconf.common.patch.PatchContext;
 import org.opendaylight.restconf.common.patch.PatchStatusContext;
 
+@Singleton
 public final class StatisticsRestconfServiceWrapper implements RestconfService {
 
     AtomicLong operationalGet = new AtomicLong();
@@ -38,11 +41,18 @@ public final class StatisticsRestconfServiceWrapper implements RestconfService {
 
     private final RestconfService delegate;
 
-    private StatisticsRestconfServiceWrapper(final RestconfService delegate) {
+    @Inject
+    public StatisticsRestconfServiceWrapper(final RestconfImpl delegate) {
         this.delegate = delegate;
     }
 
-    public static StatisticsRestconfServiceWrapper newInstance(RestconfService delegate) {
+    /**
+     * Factory method.
+     *
+     * @deprecated Just use {@link #StatisticsRestconfServiceWrapper(RestconfImpl)} constructor instead.
+     */
+    @Deprecated
+    public static StatisticsRestconfServiceWrapper newInstance(RestconfImpl delegate) {
         return new StatisticsRestconfServiceWrapper(delegate);
     }
 
@@ -67,8 +77,13 @@ public final class StatisticsRestconfServiceWrapper implements RestconfService {
     }
 
     @Override
-    public NormalizedNodeContext getOperations(final UriInfo uriInfo) {
-        return this.delegate.getOperations(uriInfo);
+    public String getOperationsJSON() {
+        return this.delegate.getOperationsJSON();
+    }
+
+    @Override
+    public String getOperationsXML() {
+        return this.delegate.getOperationsXML();
     }
 
     @Override
@@ -83,12 +98,6 @@ public final class StatisticsRestconfServiceWrapper implements RestconfService {
         return this.delegate.invokeRpc(identifier, payload, uriInfo);
     }
 
-    @Override
-    public NormalizedNodeContext invokeRpc(final String identifier, final String noPayload, final UriInfo uriInfo) {
-        this.rpc.incrementAndGet();
-        return this.delegate.invokeRpc(identifier, noPayload, uriInfo);
-    }
-
     @SuppressWarnings("checkstyle:IllegalCatch")
     @Override
     public NormalizedNodeContext readConfigurationData(final String identifier, final UriInfo uriInfo) {