X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=restconf%2Frestconf-nb-bierman02%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fnetconf%2Fsal%2Frestconf%2Fapi%2FJSONRestconfService.java;h=5e3426c3b65c5860cb68229daa7a13237789b61c;hb=09c1d18add7cfc310f3d190a1a02a523159162ce;hp=17651af566da338dbca6fa5846dac8330bb78430;hpb=00e64e32da4ef456279aef1719619b091200fe3f;p=netconf.git

diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/api/JSONRestconfService.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/api/JSONRestconfService.java
index 17651af566..5e3426c3b6 100644
--- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/api/JSONRestconfService.java
+++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/api/JSONRestconfService.java
@@ -7,14 +7,12 @@
  */
 package org.opendaylight.netconf.sal.restconf.api;
 
-import com.google.common.base.Optional;
-import javax.annotation.Nonnull;
+import java.util.Optional;
 import javax.ws.rs.core.MultivaluedMap;
-
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.eclipse.jdt.annotation.NonNull;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.yangtools.yang.common.OperationFailedException;
 
-
 /**
  * Provides restconf CRUD operations via code with input/output data in JSON format.
  *
@@ -34,7 +32,7 @@ public interface JSONRestconfService {
      * @param payload the payload data in JSON format.
      * @throws OperationFailedException if the request fails.
      */
-    void put(String uriPath, @Nonnull String payload) throws OperationFailedException;
+    void put(String uriPath, @NonNull String payload) throws OperationFailedException;
 
     /**
      * Issues a restconf POST request to the configuration data store.
@@ -44,7 +42,7 @@ public interface JSONRestconfService {
      * @param payload the payload data in JSON format.
      * @throws OperationFailedException if the request fails.
      */
-    void post(String uriPath, @Nonnull String payload) throws OperationFailedException;
+    void post(String uriPath, @NonNull String payload) throws OperationFailedException;
 
     /**
      * Issues a restconf DELETE request to the configuration data store.
@@ -75,7 +73,7 @@ public interface JSONRestconfService {
      * @return an Optional containing the output in JSON format if the RPC returns output.
      * @throws OperationFailedException if the request fails.
      */
-    Optional<String> invokeRpc(@Nonnull String uriPath, Optional<String> input) throws OperationFailedException;
+    Optional<String> invokeRpc(@NonNull String uriPath, Optional<String> input) throws OperationFailedException;
 
     /**
      * Issues a restconf PATCH request to the configuration data store.
@@ -86,7 +84,7 @@ public interface JSONRestconfService {
      * @return an Optional containing the patch response data in JSON format.
      * @throws OperationFailedException if the request fails.
      */
-    Optional<String> patch(@Nonnull String uriPath, @Nonnull String payload) throws OperationFailedException;
+    Optional<String> patch(@NonNull String uriPath, @NonNull String payload) throws OperationFailedException;
 
     /**
      * Subscribe to a stream.
@@ -96,6 +94,6 @@ public interface JSONRestconfService {
      * @return On optional containing the JSON response.
      * @throws OperationFailedException if the requests fails.
      */
-    Optional<String> subscribeToStream(@Nonnull String identifier, MultivaluedMap<String, String> params)
+    Optional<String> subscribeToStream(@NonNull String identifier, MultivaluedMap<String, String> params)
                                                                                     throws OperationFailedException;
 }