X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=restconf%2Fsal-rest-docgen%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fnetconf%2Fsal%2Frest%2Fdoc%2Fmountpoints%2FMountPointSwagger.java;h=a29a9a0404a938953b0a70b72537f049db202ed1;hb=376150894b137d05800ef3ef924d58336362d0e3;hp=df9fca6d258d32c2bcd8a5444cbee82ae4fee6e6;hpb=8e29cdd1bf6d70fb3cb34ba1e89c3433a3e3cbd6;p=netconf.git

diff --git a/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/mountpoints/MountPointSwagger.java b/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/mountpoints/MountPointSwagger.java
index df9fca6d25..a29a9a0404 100644
--- a/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/mountpoints/MountPointSwagger.java
+++ b/restconf/sal-rest-docgen/src/main/java/org/opendaylight/netconf/sal/rest/doc/mountpoints/MountPointSwagger.java
@@ -7,21 +7,22 @@
  */
 package org.opendaylight.netconf.sal.rest.doc.mountpoints;
 
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
+import static com.google.common.base.Preconditions.checkState;
+import static java.util.Objects.requireNonNull;
+
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Objects;
+import java.util.Optional;
 import java.util.TreeMap;
 import java.util.concurrent.atomic.AtomicLong;
 import javax.ws.rs.core.UriInfo;
-import org.opendaylight.controller.md.sal.dom.api.DOMMountPoint;
-import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService;
+import org.opendaylight.mdsal.dom.api.DOMMountPoint;
 import org.opendaylight.mdsal.dom.api.DOMMountPointListener;
+import org.opendaylight.mdsal.dom.api.DOMMountPointService;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
 import org.opendaylight.netconf.sal.rest.doc.impl.BaseYangSwaggerGenerator;
 import org.opendaylight.netconf.sal.rest.doc.swagger.Api;
@@ -55,9 +56,9 @@ public class MountPointSwagger implements DOMMountPointListener, AutoCloseable {
 
     public MountPointSwagger(final DOMSchemaService globalSchema, final DOMMountPointService mountService,
             final BaseYangSwaggerGenerator swaggerGenerator) {
-        this.globalSchema = Objects.requireNonNull(globalSchema);
-        this.mountService = Objects.requireNonNull(mountService);
-        this.swaggerGenerator = Objects.requireNonNull(swaggerGenerator);
+        this.globalSchema = requireNonNull(globalSchema);
+        this.mountService = requireNonNull(mountService);
+        this.swaggerGenerator = requireNonNull(swaggerGenerator);
     }
 
     public void init() {
@@ -129,12 +130,11 @@ public class MountPointSwagger implements DOMMountPointListener, AutoCloseable {
     }
 
     private SchemaContext getSchemaContext(final YangInstanceIdentifier id) {
-
         if (id == null) {
             return null;
         }
 
-        Preconditions.checkState(mountService != null);
+        checkState(mountService != null);
         final Optional<DOMMountPoint> mountPoint = this.mountService.getMountPoint(id);
         if (!mountPoint.isPresent()) {
             return null;